Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-help.out @ 3833:63f8f74ac4a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Brendan Cully <brendan@kublai.com>
date Fri, 08 Dec 2006 14:06:26 -0800
parents 531c116b2028
children 6081b4c68baf
comparison
equal deleted inserted replaced
3830:08c169cbd9e1 3833:63f8f74ac4a8
134 134
135 add the specified files on the next commit 135 add the specified files on the next commit
136 136
137 Schedule files to be version controlled and added to the repository. 137 Schedule files to be version controlled and added to the repository.
138 138
139 The files will be added to the repository at the next commit. 139 The files will be added to the repository at the next commit. To
140 undo an add before that, see hg revert.
140 141
141 If no names are given, add all files in the repository. 142 If no names are given, add all files in the repository.
142 143
143 options: 144 options:
144 145
150 151
151 add the specified files on the next commit 152 add the specified files on the next commit
152 153
153 Schedule files to be version controlled and added to the repository. 154 Schedule files to be version controlled and added to the repository.
154 155
155 The files will be added to the repository at the next commit. 156 The files will be added to the repository at the next commit. To
157 undo an add before that, see hg revert.
156 158
157 If no names are given, add all files in the repository. 159 If no names are given, add all files in the repository.
158 160
159 options: 161 options:
160 162
166 diff repository (or selected files) 168 diff repository (or selected files)
167 169
168 Show differences between revisions for the specified files. 170 Show differences between revisions for the specified files.
169 171
170 Differences between files are shown using the unified diff format. 172 Differences between files are shown using the unified diff format.
173
174 NOTE: diff may generate unexpected results for merges, as it will
175 default to comparing against the working directory's first parent
176 changeset if no revisions are specified.
171 177
172 When two revision arguments are given, then changes are shown 178 When two revision arguments are given, then changes are shown
173 between those revisions. If only one revision is specified then 179 between those revisions. If only one revision is specified then
174 that revision is compared to the working directory, and, when no 180 that revision is compared to the working directory, and, when no
175 revisions are specified, the working directory files are compared 181 revisions are specified, the working directory files are compared
196 show changed files in the working directory 202 show changed files in the working directory
197 203
198 Show status of files in the repository. If names are given, only 204 Show status of files in the repository. If names are given, only
199 files that match are shown. Files that are clean or ignored, are 205 files that match are shown. Files that are clean or ignored, are
200 not listed unless -c (clean), -i (ignored) or -A is given. 206 not listed unless -c (clean), -i (ignored) or -A is given.
207
208 NOTE: status may appear to disagree with diff if permissions have
209 changed or a merge has occurred. The standard diff format does not
210 report permission changes and diff only reports changes relative
211 to one merge parent.
201 212
202 If one revision is given, it is used as the base revision. 213 If one revision is given, it is used as the base revision.
203 If two revisions are given, the difference between them is shown. 214 If two revisions are given, the difference between them is shown.
204 215
205 The codes used to show the status of files are: 216 The codes used to show the status of files are: