test-rebase-check-restore.t
151 lines
| 2.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-check-restore.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 | ||||
$ echo A > A | ||||
$ hg add A | ||||
$ hg ci -m A | ||||
$ echo 'B' > B | ||||
$ hg add B | ||||
$ hg ci -m B | ||||
$ echo C >> A | ||||
$ hg ci -m C | ||||
$ hg up -q -C 0 | ||||
$ echo D >> A | ||||
$ hg ci -m D | ||||
created new head | ||||
$ echo E > E | ||||
$ hg add E | ||||
$ hg ci -m E | ||||
$ hg up -q -C 0 | ||||
$ hg branch 'notdefault' | ||||
marked working directory as branch notdefault | ||||
|
r15615 | (branches are permanent and global, did you want a bookmark?) | ||
|
r12608 | $ echo F >> A | ||
$ hg ci -m F | ||||
$ cd .. | ||||
|
r15917 | Rebasing B onto E - check keep: and phases | ||
|
r12608 | |||
$ hg clone -q -u . a a1 | ||||
$ cd a1 | ||||
|
r15917 | $ hg phase --force --secret 2 | ||
|
r12608 | |||
$ hg tglog | ||||
|
r15917 | @ 5:draft 'F' notdefault | ||
|
r12608 | | | ||
|
r15917 | | o 4:draft 'E' | ||
|
r12608 | | | | ||
|
r15917 | | o 3:draft 'D' | ||
|
r12608 | |/ | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:draft 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:draft 'A' | ||
|
r12608 | |||
$ hg rebase -s 1 -d 4 --keep | ||||
merging A | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r12608 | |||
Solve the conflict and go on: | ||||
$ echo 'conflict solved' > A | ||||
$ rm A.orig | ||||
$ hg resolve -m A | ||||
|
r21267 | no more unresolved files | ||
|
r12608 | $ hg rebase --continue | ||
$ hg tglog | ||||
|
r19925 | o 7:secret 'C' | ||
|
r12608 | | | ||
|
r15917 | o 6:draft 'B' | ||
|
r12608 | | | ||
|
r19925 | | @ 5:draft 'F' notdefault | ||
|
r12608 | | | | ||
|
r15917 | o | 4:draft 'E' | ||
|
r12608 | | | | ||
|
r15917 | o | 3:draft 'D' | ||
|
r12608 | |/ | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:draft 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:draft 'A' | ||
|
r12608 | |||
$ cd .. | ||||
Rebase F onto E - check keepbranches: | ||||
$ hg clone -q -u . a a2 | ||||
$ cd a2 | ||||
|
r15917 | $ hg phase --force --secret 2 | ||
|
r12608 | |||
$ hg tglog | ||||
|
r15917 | @ 5:draft 'F' notdefault | ||
|
r12608 | | | ||
|
r15917 | | o 4:draft 'E' | ||
|
r12608 | | | | ||
|
r15917 | | o 3:draft 'D' | ||
|
r12608 | |/ | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:draft 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:draft 'A' | ||
|
r12608 | |||
$ hg rebase -s 5 -d 4 --keepbranches | ||||
merging A | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r12608 | |||
Solve the conflict and go on: | ||||
$ echo 'conflict solved' > A | ||||
$ rm A.orig | ||||
$ hg resolve -m A | ||||
|
r21267 | no more unresolved files | ||
|
r12608 | $ hg rebase --continue | ||
|
r12640 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | ||
|
r12608 | |||
$ hg tglog | ||||
|
r15917 | @ 5:draft 'F' notdefault | ||
|
r12608 | | | ||
|
r15917 | o 4:draft 'E' | ||
|
r12608 | | | ||
|
r15917 | o 3:draft 'D' | ||
|
r12608 | | | ||
|
r15917 | | o 2:secret 'C' | ||
|
r12608 | | | | ||
|
r15917 | | o 1:draft 'B' | ||
|
r12608 | |/ | ||
|
r15917 | o 0:draft 'A' | ||
|
r12608 | |||
|
r16913 | |||
$ cd .. | ||||