test-merge9.t
94 lines
| 1.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-merge9.t
|
r11982 | test that we don't interrupt the merge session if | ||
a file-level merge failed | ||||
$ hg init repo | ||||
$ cd repo | ||||
$ echo foo > foo | ||||
$ echo a > bar | ||||
$ hg ci -Am 'add foo' | ||||
adding bar | ||||
adding foo | ||||
$ hg mv foo baz | ||||
$ echo b >> bar | ||||
$ echo quux > quux1 | ||||
$ hg ci -Am 'mv foo baz' | ||||
adding quux1 | ||||
$ hg up -qC 0 | ||||
$ echo >> foo | ||||
$ echo c >> bar | ||||
$ echo quux > quux2 | ||||
$ hg ci -Am 'change foo' | ||||
adding quux2 | ||||
created new head | ||||
test with the rename on the remote side | ||||
$ HGMERGE=false hg merge | ||||
merging bar | ||||
|
r26618 | merging foo and baz to baz | ||
|
r11982 | merging bar failed! | ||
1 files updated, 1 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] | ||
|
r11982 | $ hg resolve -l | ||
U bar | ||||
R baz | ||||
test with the rename on the local side | ||||
$ hg up -C 1 | ||||
3 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ HGMERGE=false hg merge | ||||
merging bar | ||||
|
r26618 | merging baz and foo to baz | ||
|
r11982 | merging bar failed! | ||
1 files updated, 1 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] | ||
|
r11982 | |||
show unresolved | ||||
$ hg resolve -l | ||||
U bar | ||||
R baz | ||||
unmark baz | ||||
$ hg resolve -u baz | ||||
show | ||||
$ hg resolve -l | ||||
U bar | ||||
U baz | ||||
$ hg st | ||||
M bar | ||||
M baz | ||||
M quux2 | ||||
? bar.orig | ||||
re-resolve baz | ||||
$ hg resolve baz | ||||
merging baz and foo to baz | ||||
after resolve | ||||
$ hg resolve -l | ||||
U bar | ||||
R baz | ||||
resolve all warning | ||||
$ hg resolve | ||||
|
r21940 | abort: no files or directories specified | ||
|
r26352 | (use --all to re-merge all unresolved files) | ||
|
r12316 | [255] | ||
|
r11982 | |||
resolve all | ||||
$ hg resolve -a | ||||
merging bar | ||||
|
r26614 | warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') | ||
|
r12316 | [1] | ||
|
r11982 | |||
after | ||||
$ hg resolve -l | ||||
U bar | ||||
R baz | ||||
|
r16913 | |||
$ cd .. | ||||