comparison tests/test-help.out @ 6042:2da5b19a6460

Merge with crew
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 06 Feb 2008 19:57:52 -0800
parents 1d0bfa4c75c0 5d91f6e6f841
children acc40572da5b
comparison
equal deleted inserted replaced
6041:dd714452c26e 6042:2da5b19a6460
13 merge merge working directory with another revision 13 merge merge working directory with another revision
14 parents show the parents of the working dir or revision 14 parents show the parents of the working dir or revision
15 pull pull changes from the specified source 15 pull pull changes from the specified source
16 push push changes to the specified destination 16 push push changes to the specified destination
17 remove remove the specified files on the next commit 17 remove remove the specified files on the next commit
18 revert revert files or dirs to their states as of some revision
19 serve export the repository via HTTP 18 serve export the repository via HTTP
20 status show changed files in the working directory 19 status show changed files in the working directory
21 update update working directory 20 update update working directory
22 21
23 use "hg help" for the full list of commands or "hg -v" for details 22 use "hg help" for the full list of commands or "hg -v" for details
32 merge merge working directory with another revision 31 merge merge working directory with another revision
33 parents show the parents of the working dir or revision 32 parents show the parents of the working dir or revision
34 pull pull changes from the specified source 33 pull pull changes from the specified source
35 push push changes to the specified destination 34 push push changes to the specified destination
36 remove remove the specified files on the next commit 35 remove remove the specified files on the next commit
37 revert revert files or dirs to their states as of some revision
38 serve export the repository via HTTP 36 serve export the repository via HTTP
39 status show changed files in the working directory 37 status show changed files in the working directory
40 update update working directory 38 update update working directory
41 Mercurial Distributed SCM 39 Mercurial Distributed SCM
42 40
45 add add the specified files on the next commit 43 add add the specified files on the next commit
46 addremove add all new files, delete all missing files 44 addremove add all new files, delete all missing files
47 annotate show changeset information per file line 45 annotate show changeset information per file line
48 archive create unversioned archive of a repository revision 46 archive create unversioned archive of a repository revision
49 backout reverse effect of earlier changeset 47 backout reverse effect of earlier changeset
48 bisect subdivision search of changesets
50 branch set or show the current branch name 49 branch set or show the current branch name
51 branches list repository named branches 50 branches list repository named branches
52 bundle create a changegroup file 51 bundle create a changegroup file
53 cat output the current or given revision of files 52 cat output the current or given revision of files
54 clone make a copy of an existing repository 53 clone make a copy of an existing repository
73 pull pull changes from the specified source 72 pull pull changes from the specified source
74 push push changes to the specified destination 73 push push changes to the specified destination
75 recover roll back an interrupted transaction 74 recover roll back an interrupted transaction
76 remove remove the specified files on the next commit 75 remove remove the specified files on the next commit
77 rename rename files; equivalent of copy + remove 76 rename rename files; equivalent of copy + remove
78 revert revert files or dirs to their states as of some revision 77 revert restore individual files or dirs to an earlier state
79 rollback roll back the last transaction in this repository 78 rollback roll back the last transaction
80 root print the root (top) of the current working dir 79 root print the root (top) of the current working dir
81 serve export the repository via HTTP 80 serve export the repository via HTTP
82 showconfig show combined config settings from all hgrc files 81 showconfig show combined config settings from all hgrc files
83 status show changed files in the working directory 82 status show changed files in the working directory
84 tag add a tag for the current or given revision 83 tag add a tag for the current or given revision
93 add add the specified files on the next commit 92 add add the specified files on the next commit
94 addremove add all new files, delete all missing files 93 addremove add all new files, delete all missing files
95 annotate show changeset information per file line 94 annotate show changeset information per file line
96 archive create unversioned archive of a repository revision 95 archive create unversioned archive of a repository revision
97 backout reverse effect of earlier changeset 96 backout reverse effect of earlier changeset
97 bisect subdivision search of changesets
98 branch set or show the current branch name 98 branch set or show the current branch name
99 branches list repository named branches 99 branches list repository named branches
100 bundle create a changegroup file 100 bundle create a changegroup file
101 cat output the current or given revision of files 101 cat output the current or given revision of files
102 clone make a copy of an existing repository 102 clone make a copy of an existing repository
121 pull pull changes from the specified source 121 pull pull changes from the specified source
122 push push changes to the specified destination 122 push push changes to the specified destination
123 recover roll back an interrupted transaction 123 recover roll back an interrupted transaction
124 remove remove the specified files on the next commit 124 remove remove the specified files on the next commit
125 rename rename files; equivalent of copy + remove 125 rename rename files; equivalent of copy + remove
126 revert revert files or dirs to their states as of some revision 126 revert restore individual files or dirs to an earlier state
127 rollback roll back the last transaction in this repository 127 rollback roll back the last transaction
128 root print the root (top) of the current working dir 128 root print the root (top) of the current working dir
129 serve export the repository via HTTP 129 serve export the repository via HTTP
130 showconfig show combined config settings from all hgrc files 130 showconfig show combined config settings from all hgrc files
131 status show changed files in the working directory 131 status show changed files in the working directory
132 tag add a tag for the current or given revision 132 tag add a tag for the current or given revision
210 -X --exclude exclude names matching the given patterns 210 -X --exclude exclude names matching the given patterns
211 211
212 use "hg -v help diff" to show global options 212 use "hg -v help diff" to show global options
213 hg status [OPTION]... [FILE]... 213 hg status [OPTION]... [FILE]...
214 214
215 aliases: st
216
215 show changed files in the working directory 217 show changed files in the working directory
216 218
217 Show status of files in the repository. If names are given, only 219 Show status of files in the repository. If names are given, only
218 files that match are shown. Files that are clean or ignored, are 220 files that match are shown. Files that are clean or ignored or
219 not listed unless -c (clean), -i (ignored) or -A is given. 221 source of a copy/move operation, are not listed unless -c (clean),
222 -i (ignored), -C (copies) or -A is given. Unless options described
223 with "show only ..." are given, the options -mardu are used.
220 224
221 NOTE: status may appear to disagree with diff if permissions have 225 NOTE: status may appear to disagree with diff if permissions have
222 changed or a merge has occurred. The standard diff format does not 226 changed or a merge has occurred. The standard diff format does not
223 report permission changes and diff only reports changes relative 227 report permission changes and diff only reports changes relative
224 to one merge parent. 228 to one merge parent.
231 A = added 235 A = added
232 R = removed 236 R = removed
233 C = clean 237 C = clean
234 ! = deleted, but still tracked 238 ! = deleted, but still tracked
235 ? = not tracked 239 ? = not tracked
236 I = ignored (not shown by default) 240 I = ignored
237 = the previous added file was copied from here 241 = the previous added file was copied from here
238
239 aliases: st
240 242
241 options: 243 options:
242 244
243 -A --all show status of all files 245 -A --all show status of all files
244 -m --modified show only modified files 246 -m --modified show only modified files
275 merge merge working directory with another revision 277 merge merge working directory with another revision
276 parents show the parents of the working dir or revision 278 parents show the parents of the working dir or revision
277 pull pull changes from the specified source 279 pull pull changes from the specified source
278 push push changes to the specified destination 280 push push changes to the specified destination
279 remove remove the specified files on the next commit 281 remove remove the specified files on the next commit
280 revert revert files or dirs to their states as of some revision
281 serve export the repository via HTTP 282 serve export the repository via HTTP
282 status show changed files in the working directory 283 status show changed files in the working directory
283 update update working directory 284 update update working directory
284 285
285 use "hg help" for the full list of commands or "hg -v" for details 286 use "hg help" for the full list of commands or "hg -v" for details
299 merge merge working directory with another revision 300 merge merge working directory with another revision
300 parents show the parents of the working dir or revision 301 parents show the parents of the working dir or revision
301 pull pull changes from the specified source 302 pull pull changes from the specified source
302 push push changes to the specified destination 303 push push changes to the specified destination
303 remove remove the specified files on the next commit 304 remove remove the specified files on the next commit
304 revert revert files or dirs to their states as of some revision
305 serve export the repository via HTTP 305 serve export the repository via HTTP
306 status show changed files in the working directory 306 status show changed files in the working directory
307 update update working directory 307 update update working directory
308 308
309 use "hg help" for the full list of commands or "hg -v" for details 309 use "hg help" for the full list of commands or "hg -v" for details