test-commit-unresolved.t
47 lines
| 1023 B
| text/troff
|
Tads3Lexer
/ tests / test-commit-unresolved.t
|
r11804 | $ addcommit () { | ||
> echo $1 > $1 | ||||
> hg add $1 | ||||
> hg commit -d "${2} 0" -m $1 | ||||
> } | ||||
$ commit () { | ||||
> hg commit -d "${2} 0" -m $1 | ||||
> } | ||||
$ hg init a | ||||
$ cd a | ||||
$ addcommit "A" 0 | ||||
$ addcommit "B" 1 | ||||
$ echo "C" >> A | ||||
$ commit "C" 2 | ||||
$ hg update -C 0 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "D" >> A | ||||
$ commit "D" 3 | ||||
created new head | ||||
Merging a conflict araises | ||||
$ hg merge | ||||
merging A | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r11804 | 1 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] | ||
|
r11804 | |||
Correct the conflict without marking the file as resolved | ||||
$ echo "ABCD" > A | ||||
$ hg commit -m "Merged" | ||||
|
r13541 | abort: unresolved merge conflicts (see hg help resolve) | ||
|
r12316 | [255] | ||
|
r11804 | |||
Mark the conflict as resolved and commit | ||||
$ hg resolve -m A | ||||
|
r21947 | (no more unresolved files) | ||
|
r11804 | $ hg commit -m "Merged" | ||
|
r16913 | |||
$ cd .. | ||||