test-rebase-conflicts.t
126 lines
| 1.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-conflicts.t
|
r12608 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> graphlog= | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r12608 | > [alias] | ||
|
r18755 | > tglog = log -G --template "{rev}:{phase} '{desc}' {branches} {bookmarks}\n" | ||
|
r12608 | > EOF | ||
$ hg init a | ||||
$ cd a | ||||
$ echo c1 >common | ||||
$ hg add common | ||||
$ hg ci -m C1 | ||||
$ echo c2 >>common | ||||
$ hg ci -m C2 | ||||
$ echo c3 >>common | ||||
$ hg ci -m C3 | ||||
$ hg up -q -C 1 | ||||
$ echo l1 >>extra | ||||
$ hg add extra | ||||
$ hg ci -m L1 | ||||
created new head | ||||
$ sed -e 's/c2/l2/' common > common.new | ||||
$ mv common.new common | ||||
$ hg ci -m L2 | ||||
$ echo l3 >> extra2 | ||||
$ hg add extra2 | ||||
$ hg ci -m L3 | ||||
|
r18755 | $ hg bookmark mybook | ||
|
r12608 | |||
|
r15917 | $ hg phase --force --secret 4 | ||
|
r12608 | $ hg tglog | ||
|
r18755 | @ 5:secret 'L3' mybook | ||
|
r12608 | | | ||
|
r15917 | o 4:secret 'L2' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'L1' | ||
|
r12608 | | | ||
|
r15917 | | o 2:draft 'C3' | ||
|
r12608 | |/ | ||
|
r15917 | o 1:draft 'C2' | ||
|
r12608 | | | ||
|
r15917 | o 0:draft 'C1' | ||
|
r12608 | |||
Try to call --continue: | ||||
$ hg rebase --continue | ||||
abort: no rebase in progress | ||||
[255] | ||||
Conflicting rebase: | ||||
$ hg rebase -s 3 -d 2 | ||||
merging common | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r12608 | |||
Try to continue without solving the conflict: | ||||
|
r17345 | $ hg rebase --continue | ||
|
r13541 | abort: unresolved merge conflicts (see hg help resolve) | ||
|
r12608 | [255] | ||
Conclude rebase: | ||||
$ echo 'resolved merge' >common | ||||
$ hg resolve -m common | ||||
$ hg rebase --continue | ||||
|
r12640 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | ||
|
r12608 | |||
$ hg tglog | ||||
|
r18755 | @ 5:secret 'L3' mybook | ||
|
r12608 | | | ||
|
r15917 | o 4:secret 'L2' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'L1' | ||
|
r12608 | | | ||
|
r15917 | o 2:draft 'C3' | ||
|
r12608 | | | ||
|
r15917 | o 1:draft 'C2' | ||
|
r12608 | | | ||
|
r15917 | o 0:draft 'C1' | ||
|
r12608 | |||
Check correctness: | ||||
$ hg cat -r 0 common | ||||
c1 | ||||
$ hg cat -r 1 common | ||||
c1 | ||||
c2 | ||||
$ hg cat -r 2 common | ||||
c1 | ||||
c2 | ||||
c3 | ||||
$ hg cat -r 3 common | ||||
c1 | ||||
c2 | ||||
c3 | ||||
$ hg cat -r 4 common | ||||
resolved merge | ||||
$ hg cat -r 5 common | ||||
resolved merge | ||||
|
r18755 | Bookmark stays active after --continue | ||
$ hg bookmarks | ||||
* mybook 5:d67b21408fc0 | ||||
|
r16913 | $ cd .. | ||