equal
deleted
inserted
replaced
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' |
|
10 |
|
11 echo bar >> file |
|
12 hg commit -Am 'append bar' |
|
13 |
|
14 echo % create a second head |
|
15 hg up -C 0 |
|
16 echo baz >> file |
|
17 hg commit -Am 'append baz' |
|
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' |
|
25 |
|
26 echo % resolve -l, should be empty |
|
27 hg resolve -l |
|
28 |
|
29 # test crashed merge with empty mergestate |
|
30 mkdir .hg/merge |
|
31 touch .hg/merge/state |
|
32 echo % resolve -l, should be empty |
|
33 hg resolve -l |
|