Mercurial > hg-stable
comparison tests/test-resolve @ 7734:9f73bddb9d0b
reset mergestate after commit
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Thu, 25 Dec 2008 10:42:01 +0100 |
parents | |
children | 6c82beaaa11a |
comparison
equal
deleted
inserted
replaced
7733:30e95eafc1d0 | 7734:9f73bddb9d0b |
---|---|
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 | |
9 hg commit -Am 'add file' -d '0 0' | |
10 | |
11 echo bar >> file | |
12 hg commit -Am 'append bar' -d '0 0' | |
13 | |
14 echo % create a second head | |
15 hg up -C 0 | |
16 echo baz >> file | |
17 hg commit -Am 'append baz' -d '0 0' | |
18 | |
19 echo % failing merge | |
20 HGMERGE=internal:fail hg merge | |
21 | |
22 echo resolved > file | |
23 hg resolve -m file | |
24 hg commit -m 'resolved' -d '0 0' | |
25 | |
26 echo % resolve -l, should be empty | |
27 hg resolve -l |