Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable doc: add more detail to the commit chapter

Changeset a1223d9898b5…

Parent 9c8f8913ee35…

by Steve Borho

Changes to 2 files · Browse files at a1223d9898b5 Showing diff from parent 9c8f8913ee35 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​TODO Stacked
 
1
2
3
4
5
 
1
 
2
3
4
@@ -1,5 +1,4 @@
 Update context menu screenshot -Commit needs more detail  Add links to BB wiki and Mercurial wiki  Describe path editing and [auth] hgrc section  Need a page explaining merges and merge undo
Change 1 of 2 Show Entire File doc/​source/​commit.txt Stacked
 
65
66
67
68
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
69
70
 
 
71
72
 
73
74
75
 
79
80
81
 
 
 
 
 
 
 
 
 
 
 
 
 
 
82
83
84
85
 
86
87
88
 
65
66
67
 
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
 
84
85
86
 
87
88
89
90
 
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
 
114
115
116
117
@@ -65,11 +65,26 @@
  commit tool into 'QNew' mode where the working directory changes   will be applied to a new patch.   -Below the file list are checkboxes that toggle the inclusion of the + +The file list has four columns: + +1) A checkbox that indicates whether the file is selected for an + operation. The toolbar buttons only operate on checked files. + "Partially" selected files have a special check state. This column + header is checkable, it will toggle the file selection states. +2) The :guilabel:`st` column holds the status of the file, defined by + Mercurial's status command, one of 'MARD?IC'. +3) The :guilabel:`ms` column holds the merge state of the file, defined + by Mercurial's resolve command, one of ' RU'. See the merge section + below. +4) The canonical path of the file (relative to the repository root) + +Below the file list are checkboxes that toggle the display of the  various classes of files {modified, added, removed, deleted, unknown, -clean, ignored}. +clean, ignored}. These check boxes will be disabled if the commit tool +was given a specific set of files and/or directories.   -Removed means a revisioned file has been marked as removed. Deleted +*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 @@ -79,10 +94,24 @@
 and the new file as added while recording the whole operation as a  rename.   +*Unknown* files are not tracked by Mercurial, but they also do not match +any ignore filters you have configured. Unknown files are shown by +default because they are usually files that need to be added to revision +control. It is recommended that you keep your ignore filters up to date +to ensure that is the case. The context menu of unknown files has an +option open the ignore pattern tool. + +*Clean* files are tracked files that have not been modified, while +*Ignored* files are untracked files that match a configured ignore +pattern. Neither of those file types are shown by default, unless a the +user includes such a file in a selection (explorer) or provides the file +on the command line. + +  Change Selection (record)  -------------------------   -So what does that mean when it says the commit button will commit the +So what does it mean when we say the commit button will commit the  selected diffs in checked files? Simple, the native TortoiseHg commit  tool supports change selection instrinsically in the diff browser. This  means that all of the changes you make to versioned files can be