test-resolve.t
63 lines
| 1.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-resolve.t
|
r12117 | test that a commit clears the merge state. | ||
$ hg init repo | ||||
$ cd repo | ||||
$ echo foo > file | ||||
$ hg commit -Am 'add file' | ||||
adding file | ||||
$ echo bar >> file | ||||
$ hg commit -Am 'append bar' | ||||
create a second head | ||||
$ hg up -C 0 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo baz >> file | ||||
$ hg commit -Am 'append baz' | ||||
created new head | ||||
failing merge | ||||
|
r12788 | $ hg merge --tool=internal:fail | ||
|
r12117 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r12314 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | ||
|
r12316 | [1] | ||
|
r12117 | |||
|
r21263 | resolve -l should contain an unresolved entry | ||
$ hg resolve -l | ||||
U file | ||||
|
r21265 | resolving an unknown path emits a warning | ||
$ hg resolve -m does-not-exist | ||||
|
r21721 | arguments do not match paths that need resolving | ||
|
r21265 | |||
|
r21263 | resolve the failure | ||
|
r12117 | $ echo resolved > file | ||
$ hg resolve -m file | ||||
|
r21947 | (no more unresolved files) | ||
|
r12117 | $ hg commit -m 'resolved' | ||
|
r21541 | resolve -l should be empty | ||
|
r12117 | |||
$ hg resolve -l | ||||
|
r21541 | |||
resolve -m should abort since no merge in progress | ||||
$ hg resolve -m | ||||
|
r21264 | abort: resolve command not applicable when not merging | ||
[255] | ||||
|
r12117 | |||
test crashed merge with empty mergestate | ||||
$ mkdir .hg/merge | ||||
$ touch .hg/merge/state | ||||
resolve -l, should be empty | ||||
$ hg resolve -l | ||||
|
r16913 | |||
$ cd .. | ||||