test-rebase-abort.t
235 lines
| 4.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-abort.t
|
r12608 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r12608 | > [alias] | ||
|
r15917 | > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" | ||
|
r12608 | > EOF | ||
$ hg init a | ||||
$ cd a | ||||
|
r20327 | $ touch .hg/rebasestate | ||
$ hg sum | ||||
parent: -1:000000000000 tip (empty repository) | ||||
branch: default | ||||
commit: (clean) | ||||
update: (current) | ||||
abort: .hg/rebasestate is incomplete | ||||
[255] | ||||
$ rm .hg/rebasestate | ||||
|
r12608 | $ 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 | ||||
|
r15917 | $ hg phase --force --secret 2 | ||
|
r12608 | $ hg tglog | ||
|
r15917 | @ 4:draft 'L2' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'L1' | ||
| | ||||
| o 2:secret 'C3' | ||||
|
r12608 | |/ | ||
|
r15917 | o 1:draft 'C2' | ||
|
r12608 | | | ||
|
r15917 | o 0:draft 'C1' | ||
|
r12608 | |||
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 | |||
Abort: | ||||
$ hg rebase --abort | ||||
|
r12640 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | ||
|
r12608 | rebase aborted | ||
$ hg tglog | ||||
|
r15917 | @ 4:draft 'L2' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'L1' | ||
|
r12608 | | | ||
|
r15917 | | o 2:secret 'C3' | ||
|
r12608 | |/ | ||
|
r15917 | o 1:draft 'C2' | ||
|
r12608 | | | ||
|
r15917 | o 0:draft 'C1' | ||
|
r12608 | |||
|
r19848 | Test safety for inconsistent rebase state, which may be created (and | ||
forgotten) by Mercurial earlier than 2.7. This emulates Mercurial | ||||
earlier than 2.7 by renaming ".hg/rebasestate" temporarily. | ||||
$ hg rebase -s 3 -d 2 | ||||
merging common | ||||
warning: conflicts during merge. | ||||
merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
unresolved conflicts (see hg resolve, then hg rebase --continue) | ||||
[1] | ||||
$ mv .hg/rebasestate .hg/rebasestate.back | ||||
$ hg update --quiet --clean 2 | ||||
$ hg --config extensions.mq= strip --quiet "destination()" | ||||
$ mv .hg/rebasestate.back .hg/rebasestate | ||||
$ hg rebase --continue | ||||
abort: cannot continue inconsistent rebase | ||||
|
r20313 | (use "hg rebase --abort" to clear broken state) | ||
|
r19848 | [255] | ||
|
r19849 | $ hg summary | grep '^rebase: ' | ||
rebase: (use "hg rebase --abort" to clear broken state) | ||||
|
r19848 | $ hg rebase --abort | ||
rebase aborted (no revision is removed, only broken state is cleared) | ||||
|
r12608 | $ cd .. | ||
|
r17477 | Construct new repo: | ||
|
r12608 | |||
$ hg init b | ||||
$ cd b | ||||
$ echo a > a | ||||
$ hg ci -Am A | ||||
adding a | ||||
$ echo b > b | ||||
$ hg ci -Am B | ||||
adding b | ||||
$ echo c > c | ||||
$ hg ci -Am C | ||||
adding c | ||||
$ hg up -q 0 | ||||
$ echo b > b | ||||
$ hg ci -Am 'B bis' | ||||
adding b | ||||
created new head | ||||
$ echo c1 > c | ||||
$ hg ci -Am C1 | ||||
adding c | ||||
|
r15917 | $ hg phase --force --secret 1 | ||
$ hg phase --public 1 | ||||
|
r12608 | Rebase and abort without generating new changesets: | ||
$ hg tglog | ||||
|
r15917 | @ 4:draft 'C1' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'B bis' | ||
|
r12608 | | | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:public 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:public 'A' | ||
|
r12608 | |||
$ hg rebase -b 4 -d 2 | ||||
merging c | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r12608 | |||
$ hg tglog | ||||
|
r15917 | @ 4:draft 'C1' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'B bis' | ||
|
r12608 | | | ||
|
r15917 | | @ 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:public 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:public 'A' | ||
|
r12608 | |||
$ hg rebase -a | ||||
rebase aborted | ||||
$ hg tglog | ||||
|
r15917 | @ 4:draft 'C1' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'B bis' | ||
|
r12608 | | | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:public 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:public 'A' | ||
|
r12608 | |||
|
r16913 | |||
$ cd .. | ||||
|
r19984 | |||
rebase abort should not leave working copy in a merge state if tip-1 is public | ||||
(issue4082) | ||||
$ hg init abortpublic | ||||
$ cd abortpublic | ||||
$ echo a > a && hg ci -Aqm a | ||||
$ hg book master | ||||
$ hg book foo | ||||
$ echo b > b && hg ci -Aqm b | ||||
$ hg up -q master | ||||
$ echo c > c && hg ci -Aqm c | ||||
$ hg phase -p -r . | ||||
$ hg up -q foo | ||||
$ echo C > c && hg ci -Aqm C | ||||
$ hg log -G --template "{rev} {desc} {bookmarks}" | ||||
@ 3 C foo | ||||
| | ||||
| o 2 c master | ||||
| | | ||||
o | 1 b | ||||
|/ | ||||
o 0 a | ||||
$ hg rebase -d master -r foo | ||||
merging c | ||||
warning: conflicts during merge. | ||||
merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
unresolved conflicts (see hg resolve, then hg rebase --continue) | ||||
[1] | ||||
$ hg rebase --abort | ||||
rebase aborted | ||||
$ hg log -G --template "{rev} {desc} {bookmarks}" | ||||
@ 3 C foo | ||||
| | ||||
| o 2 c master | ||||
| | | ||||
o | 1 b | ||||
|/ | ||||
o 0 a | ||||
$ cd .. | ||||