test-absorb-unfinished.t
30 lines
| 798 B
| text/troff
|
Tads3Lexer
/ tests / test-absorb-unfinished.t
|
r42297 | $ cat >> $HGRCPATH << EOF | ||
> [extensions] | ||||
> absorb= | ||||
> EOF | ||||
Abort absorb if there is an unfinished operation. | ||||
$ hg init abortunresolved | ||||
$ cd abortunresolved | ||||
$ echo "foo1" > foo.whole | ||||
$ hg commit -Aqm "foo 1" | ||||
$ hg update null | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo "foo2" > foo.whole | ||||
$ hg commit -Aqm "foo 2" | ||||
$ hg --config extensions.rebase= rebase -r 1 -d 0 | ||||
rebasing 1:c3b6dc0e177a "foo 2" (tip) | ||||
merging foo.whole | ||||
warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') | ||||
|
r45710 | unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | ||
|
r42297 | [1] | ||
$ hg --config extensions.rebase= absorb | ||||
abort: rebase in progress | ||||
|
r45774 | (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') | ||
|
r42297 | [255] | ||