Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-help.out @ 576:da11baf5de7b
Handle unknown files better on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle unknown files better on update
If we spot an unknown file that's identical to one that's in the
update, we get the updated one so that it shows up in the dirstate
properly.
manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ
VgKqZS54hTAWN3jL2yllUhI=
=iPQD
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Sat, 02 Jul 2005 15:21:22 -0800 |
| parents | 98a2935c3d6c |
| children | 9db6d5455642 |
| rev | line source |
|---|---|
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
364
diff
changeset
|
1 + hg -q help |
| 331 | 2 hg commands: |
| 3 | |
| 4 add add the specified files on the next commit | |
| 5 addremove add all new files, delete all missing files | |
| 6 annotate show changeset information per file line | |
| 7 cat output the latest or given revision of a file | |
| 485 | 8 clone make a copy of an existing repository |
| 331 | 9 commit commit the specified files or all outstanding changes |
|
364
6f43778f26da
test-help: hg copy now shows up in the help
mpm@selenic.com
parents:
350
diff
changeset
|
10 copy mark a file as copied or renamed for the next commit |
| 331 | 11 diff diff working directory (or selected files) |
| 12 export dump the changeset header and diffs for a revision | |
| 13 forget don't add the specified files on the next commit | |
| 14 heads show current repository heads | |
| 15 help show help for a given command or all commands | |
| 342 | 16 identify print information about the working copy |
| 440 | 17 import import an ordered set of patches |
| 496 | 18 init create a new repository in the current directory |
| 509 | 19 log show the revision history of the repository or a single file |
| 331 | 20 manifest output the latest or given revision of the project manifest |
| 21 parents show the parents of the current working dir | |
| 22 pull pull changes from the specified source | |
| 23 push push changes to the specified destination | |
| 24 rawcommit raw commit interface | |
| 25 recover roll back an interrupted transaction | |
| 26 remove remove the specified files on the next commit | |
| 468 | 27 root print the root (top) of the current working dir |
| 331 | 28 serve export the repository via HTTP |
| 29 status show changed files in the working directory | |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
364
diff
changeset
|
30 tag add a tag for the current tip or a given revision |
| 331 | 31 tags list repository tags |
| 32 tip show the tip revision | |
| 33 undo undo the last transaction | |
| 34 update update or merge working directory | |
| 35 verify verify the integrity of the repository | |
| 467 | 36 version output version and copyright information |
| 331 | 37 + hg add -h |
| 38 hg add: option -h not recognized | |
| 39 hg add [files] | |
| 40 | |
| 41 add the specified files on the next commit | |
| 42 + hg help diff | |
| 43 hg diff [-r A] [-r B] [files] | |
| 44 | |
| 45 -r --rev | |
| 46 revision | |
| 47 | |
| 48 diff working directory (or selected files) | |
| 49 + hg help foo | |
| 50 hg: unknown command foo | |
|
423
25afb21d97ba
Support for 'hg --version'. setup.py stores version from hg repository.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
364
diff
changeset
|
51 + hg -q commands |
| 336 | 52 hg: unknown command 'commands' |
| 53 hg commands: | |
| 54 | |
| 55 add add the specified files on the next commit | |
| 56 addremove add all new files, delete all missing files | |
| 57 annotate show changeset information per file line | |
| 58 cat output the latest or given revision of a file | |
| 485 | 59 clone make a copy of an existing repository |
| 336 | 60 commit commit the specified files or all outstanding changes |
|
364
6f43778f26da
test-help: hg copy now shows up in the help
mpm@selenic.com
parents:
350
diff
changeset
|
61 copy mark a file as copied or renamed for the next commit |
| 336 | 62 diff diff working directory (or selected files) |
| 63 export dump the changeset header and diffs for a revision | |
| 64 forget don't add the specified files on the next commit | |
| 65 heads show current repository heads | |
| 66 help show help for a given command or all commands | |
| 342 | 67 identify print information about the working copy |
| 440 | 68 import import an ordered set of patches |
| 496 | 69 init create a new repository in the current directory |
| 509 | 70 log show the revision history of the repository or a single file |
| 336 | 71 manifest output the latest or given revision of the project manifest |
| 72 parents show the parents of the current working dir | |
| 73 pull pull changes from the specified source | |
| 74 push push changes to the specified destination | |
| 75 rawcommit raw commit interface | |
| 76 recover roll back an interrupted transaction | |
| 77 remove remove the specified files on the next commit | |
| 468 | 78 root print the root (top) of the current working dir |
| 336 | 79 serve export the repository via HTTP |
| 80 status show changed files in the working directory | |
|
401
af4848f83e68
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
mpm@selenic.com
parents:
364
diff
changeset
|
81 tag add a tag for the current tip or a given revision |
| 336 | 82 tags list repository tags |
| 83 tip show the tip revision | |
| 84 undo undo the last transaction | |
| 85 update update or merge working directory | |
| 86 verify verify the integrity of the repository | |
| 467 | 87 version output version and copyright information |
| 336 | 88 + exit 0 |