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

stable doc: update commit.txt, tweaks for workbench.txt

Changeset eae301c170df…

Parent ff93e9278cc6…

by Steve Borho

Changes to 2 files · Browse files at eae301c170df Showing diff from parent ff93e9278cc6 Diff from another changeset...

Change 1 of 6 Show Entire File doc/​source/​commit.txt Stacked
 
4
5
6
7
8
 
 
9
10
 
11
12
13
 
58
59
60
61
62
63
64
 
 
 
65
66
67
68
69
 
70
71
72
 
93
94
95
96
 
97
98
99
 
112
113
114
115
116
117
118
119
 
 
120
121
122
 
139
140
141
142
143
 
144
145
146
147
148
149
150
151
 
179
180
181
182
 
183
184
185
 
4
5
6
 
 
7
8
9
 
10
11
12
13
 
58
59
60
 
 
 
 
61
62
63
64
65
66
67
 
68
69
70
71
 
92
93
94
 
95
96
97
98
 
111
112
113
 
 
 
 
 
114
115
116
117
118
 
135
136
137
 
 
138
139
140
141
142
 
143
144
145
 
173
174
175
 
176
177
178
179
@@ -4,10 +4,10 @@
 .. module:: commit.dialog   :synopsis: Dialog used to perform commit   -The commit tool is second most commonly used application (behind the -Workbech). Not only can the commit tool commit your changes, but it can +The commit tool is second most commonly used application after the +Workbech. 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, record renames, manage the +routine maintenance tasks (add new files, detect renames, manage the  ignore filter, etc).    .. figure:: figures/commit.png @@ -58,15 +58,14 @@
  file pattern and give you an unfiltered view of the entire working   directory.   -Below the file list, inside an expander, are checkboxes that toggle the -display of the various classes of files {modified, added, removed, -deleted, unknown, clean, ignored}. These check boxes will be disabled -if the commit tool was started with a file pattern or selection. +The :guilabel:`Status` button has a menu with checkable options that +toggle the display of the various classes of files {modified, added, +removed, deleted, unknown, clean, ignored}.    *Removed* means a revisioned file has been marked as removed. *Deleted*  means a revisioned file is missing but Mercurial has not been told to  quit tracking that file. For instance, if you rename a revisioned file -in the explorer, the original filename will show up as deleted and the +in Explorer, the original filename will show up as deleted and the  new filename will show up as unknown. By right-clicking on the new  filename you can bring up the rename guessing dialog which can discover  the rename by comparing file contents and mark the old file as removed @@ -93,7 +92,7 @@
  Trigger the commit  :kbd:`Ctrl-E`   Reflow the paragraph currently under the cursor. You must configure - a message format policy for this key combination to work. + a message format policy for this shortcut to work.    File Context Menus  ------------------ @@ -112,11 +111,8 @@
 -------    The commit tool has a special mode when it is opened in a repository -that is in a merged state (technically, this means the current working -directory has two parent revisions). The file list has no checkboxes and -the hunk selection tabs are hidden. The commit 'manifest' is essentially -immutable, since you must commit the entire working directory after a -merge. +that is in a merged state (either a merge is in progress, or an update +was performed that caused a conflict).    The merge state *ms* column is especially useful in this mode. Files  that are marked with *R* are files where Mercurial and/or the user have @@ -139,13 +135,11 @@
 To undo a failed merge attempt, you must tell Mercurial to remove the  second parent from your working directory. This usually means  performing a clean update of the first parent. The merge tool has an -:guilabel:`Undo` button which does exactly that. The recovery tool also -has a :guilabel:`Clean` button that does the same thing. +:guilabel:`Undo` button which does exactly that.    Once you have your working directory back at one parent revision, you  may restart the merge process.   -  Commit Message Pane  -------------------   @@ -179,7 +173,7 @@
 repositories in the main repository's history.    TortoiseHg 1.0 introduced rudimentary support for subrepositories, and -only in the commit / status tool. When Mercurial considers a subrepo as +only in the commit / status tool. When Mercurial considers a subrepo  dirty, it will appear in the commit tool as a special entry in the file  list with a status of *S*. If a subrepo is included in the file list of  a commit, the subrepo is committed along with the other changes,
Change 1 of 1 Show Entire File doc/​source/​workbench.txt Stacked
 
379
380
381
382
 
 
 
383
384
 
385
386
387
388
389
 
379
380
381
 
382
383
384
385
 
386
387
 
388
389
390
@@ -379,11 +379,12 @@
  Transforms the MQ patch into a regular changeset.   *Only visible when MQ is enabled*   :guilabel:`Rebase...` - todo + Move the selected revision and all of its descendants onto the + current working parent revision. + *Only visible when rebase is enabled*   :guilabel:`Strip...` - Remove the selected revision and all of it's descendants from the + Remove the selected revision and all of its descendants from the   repository [#rcm1]_ *Only visible when MQ is enabled* - *Only visible when MQ is enabled*    With two revisions selected:   :guilabel:`Visual diff...`