Mercurial > hg
annotate tests/test-resolve @ 9857:24bc6e414610
diff: change --inverse to --reverse
This fixes an incompatibility with patch(1), which also uses --reverse
for reversed diffs. The --inverse flag was added in 3f522d2fa633. That
name was chosen over --reverse since it was thought that --reverse
would make --rev ambiguous.
It turns out that both flags can co-exist, with the cost that --rev
can no longer be shortened to --r and --re. Since one can always use
the short -r option, this is not a real problem.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Nov 2009 14:21:53 +0100 |
parents | 6c82beaaa11a |
children | 51021f4c80b5 |
rev | line source |
---|---|
7734 | 1 #!/bin/sh |
2 | |
3 # test that a commit clears the merge state. | |
4 | |
5 hg init repo | |
6 cd repo | |
7 | |
8 echo foo > file | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7734
diff
changeset
|
9 hg commit -Am 'add file' |
7734 | 10 |
11 echo bar >> file | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7734
diff
changeset
|
12 hg commit -Am 'append bar' |
7734 | 13 |
14 echo % create a second head | |
15 hg up -C 0 | |
16 echo baz >> file | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7734
diff
changeset
|
17 hg commit -Am 'append baz' |
7734 | 18 |
19 echo % failing merge | |
20 HGMERGE=internal:fail hg merge | |
21 | |
22 echo resolved > file | |
23 hg resolve -m file | |
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7734
diff
changeset
|
24 hg commit -m 'resolved' |
7734 | 25 |
26 echo % resolve -l, should be empty | |
27 hg resolve -l |