Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2.out @ 846:a30f7ee30914
When hg is invoked without parameters, the short list help is displayed.
When hg is executed without parameters ( or hg is executed with the
'help shortlist' command ) the short help list is displayed.
If the 'help' command is passed on the commandline the full help list
is displayed.
In both the cases if the switch '-v' is passed, the help contains also
the aliases of the short/full commands list and the global switches.
| author | kreijack@inwind.REMOVEME.it |
|---|---|
| date | Sat, 06 Aug 2005 13:27:31 +0100 |
| parents | 9c918287d10b |
| children | d70c1c31fd45 6d6095823b82 62ec665759f2 77b52b864249 |
line wrap: on
line source
+ hg init + hg add file1 file2 + hg commit -m added file1 and file2 -d 0 0 -u user + hg commit -m changed file1 -d 0 0 -u user + hg -q log 1:3aa14bbc23d90e3f8b5b639b4a43d76509bae76c 0:8633637036c18f021d771208e16ae3508ab81d28 + hg id 3aa14bbc23d9 tip + hg update -C 0 + hg id 8633637036c1 + hg id 8633637036c1+ + hg revert + hg diff + hg status + hg id 8633637036c1 + hg update + hg diff + hg status + hg id 3aa14bbc23d9 tip + hg update -C 0 + hg update merge: warning: conflicts during merge merging file1 merging file1 failed! + hg diff diff -r 3aa14bbc23d9 file1 --- a/file1 +++ b/file1 @@ -1,2 +1,6 @@ added file1 +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> + hg status M file1 + hg id 3aa14bbc23d9+ tip + hg revert + hg diff FIXME: This is a known bug: + hg status + hg id 3aa14bbc23d9 tip + hg revert -r tip + hg diff + hg status + hg id 3aa14bbc23d9 tip + hg update -C + hg diff + hg status + hg id 3aa14bbc23d9 tip