author | Jim Hague <jim.hague@acm.org> |
Wed, 06 Jan 2010 18:03:33 +0000 | |
branch | stable |
changeset 10253 | b190a8125b43 |
parent 8167 | 6c82beaaa11a |
child 11451 | 51021f4c80b5 |
permissions | -rwxr-xr-x |
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 |