Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0, 2.0.1, and 2.0.2

stable docs: some small improvements

Changeset 4738c30c5b59…

Parent ebf26717d7c4…

by Johan Samyn

Changes to 2 files · Browse files at 4738c30c5b59 Showing diff from parent ebf26717d7c4 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​commit.txt Stacked
 
5
6
7
8
 
9
10
11
 
5
6
7
 
8
9
10
11
@@ -5,7 +5,7 @@
  :synopsis: Dialog used to perform commit    The commit tool is second most commonly used application after the -Workbech. Not only can the commit tool commit your changes, but it can +Workbench. Not only can the commit tool commit your changes, but it can  also examine the state of your working directory and perform most  routine maintenance tasks (add new files, detect renames, manage the  ignore filter, etc).
Change 1 of 7 Show Entire File doc/​source/​quick.txt Stacked
 
78
79
80
81
 
82
83
84
 
185
186
187
188
 
189
190
191
 
211
212
213
214
 
215
216
217
 
243
244
245
246
 
247
248
249
 
327
328
329
330
 
331
332
333
334
335
336
 
337
338
339
 
343
344
345
346
 
347
348
349
 
357
358
359
360
361
 
 
362
363
364
 
365
366
367
 
78
79
80
 
81
82
83
84
 
185
186
187
 
188
189
190
191
 
211
212
213
 
214
215
216
217
 
243
244
245
 
246
247
248
249
 
327
328
329
 
330
331
332
333
334
335
 
336
337
338
339
 
343
344
345
 
346
347
348
349
 
357
358
359
 
 
360
361
362
363
 
364
365
366
367
@@ -78,7 +78,7 @@
    Donald Duck <donaldduck@example.net>   - The email address is stripped when viewing history in the changelog + The email address is stripped when viewing history in the revision history   viewer, and the built-in web server obfuscates email addresses to   prevent SPAM.   @@ -185,7 +185,7 @@
 Now it's time to tell Mercurial which files must be tracked. There are various  ways to do this:   -1. Workbench: goto the Commit tasktab, rightclick on the file, and select +1. Workbench: goto the Commit task tab, rightclick on the file, and select   :menuselection:`Add` from the context menu. This will change the status   indication of that file into 'A' and the filename will turn green.   @@ -211,7 +211,7 @@
 wish to always delete immediately, or files your editor generates, etc. You can  mark these files as ignored in some different ways too.   -1. Workbench: goto the Commit tasktab, rightclick on the file, and select +1. Workbench: goto the Commit task tab, rightclick on the file, and select   :menuselection:`Ignore...` from the context menu to open the ignore filter   dialog.   @@ -243,7 +243,7 @@
 Commit your local repository now:    Workbench: click on the Working Directory revision which also selects the Commit -tasktab, or directly select the Commit tasktab +task tab, or directly select the Commit task tab    Explorer: right-clicking anywhere in the folder, or on the folder itself, and  then selecting :guilabel:`Hg Commit...` @@ -327,13 +327,13 @@
 Suppose you've introduced some changes. It is easy to discover what pending  changes there are in the repository.   -Workbench: go to the Commit tasktab and inspect the filelist at the left +Workbench: go to the Commit task tab and inspect the filelist at the left    Any files marked with 'A' (added, green), with '?' (unversioned but not ignored,  fuchsia), with 'M' (modified, blue), or with '!' (removed, red) indicate pending  changes that should be committed.   -The Commit tasktab in the Workbench gives you a way to see differences within +The Commit task tab in the Workbench gives you a way to see differences within  the files, or you can use your visual difference tool (kdiff3). Mercurial  allows you to commit many changes before you decide to synchronize (share  changes) with the group repository. @@ -343,7 +343,7 @@
 Folders or files in Explorer marked with one of the icons below are another way of  indicating pending changes. You can traverse the directories to find specific  changes and commit them from Explorer. Though it might be quicker to do that -from the Commit tasktab in the Workbench. +from the Commit task tab in the Workbench.    .. figure:: figures/overlayicons.png   :alt: Overlay Icons @@ -357,11 +357,11 @@
 1. Commit your changes to your local repository (see above).  2. Pull changes from the group repository into your repository using   :menuselection:`TortoiseHg --> Workbench` or :command:`thg log`, select the - Sync tasktab, choose the path to the group repository in the syncbar and then - click the :guilabel:`Pull` button. + Sync task tab, choose the path to the group repository in the syncbar and + then click the :guilabel:`Pull` button.  3. If some changesets were pulled, merge those changes with your local   changes and then commit the merge into your local repository. From - the changelog viewer (:menuselection:`TortoiseHg --> Workbench` + the revision history viewer (:menuselection:`TortoiseHg --> Workbench`   or :command:`thg log`) open the context menu over the changeset   which you want to merge and select :guilabel:`Merge with local...`.   Finally, in the merge dialog, press :guilabel:`Merge` and then