test-rebase-scenario-global.t
521 lines
| 7.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-scenario-global.t
Adrian Buehlmann
|
r12608 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> graphlog= | ||||
> rebase= | ||||
> | ||||
Pierre-Yves David
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
Adrian Buehlmann
|
r12608 | > [alias] | ||
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" | ||||
> EOF | ||||
$ hg init a | ||||
$ cd a | ||||
Nicolas Dumazet
|
r14118 | $ hg unbundle $TESTDIR/bundles/rebase.hg | ||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
Nicolas Dumazet
|
r14119 | added 8 changesets with 7 changes to 7 files (+2 heads) | ||
Nicolas Dumazet
|
r14118 | (run 'hg heads' to see heads, 'hg merge' to merge) | ||
$ hg up tip | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Adrian Buehlmann
|
r12608 | $ cd .. | ||
Rebasing | ||||
Nicolas Dumazet
|
r14119 | D onto H - simple rebase: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a1 | ||||
$ cd a1 | ||||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 7: 'H' | ||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | | o 6: 'G' | ||
|/| | ||||
o | 5: 'F' | ||||
| | | ||||
Adrian Buehlmann
|
r12608 | | o 4: 'E' | ||
Nicolas Dumazet
|
r14119 | |/ | ||
| o 3: 'D' | ||||
Adrian Buehlmann
|
r12608 | | | | ||
| o 2: 'C' | ||||
Nicolas Dumazet
|
r14119 | | | | ||
Adrian Buehlmann
|
r12608 | | o 1: 'B' | ||
|/ | ||||
o 0: 'A' | ||||
Nicolas Dumazet
|
r14119 | |||
$ hg rebase -s 3 -d 7 | ||||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 7: 'D' | ||
|\ | ||||
| o 6: 'H' | ||||
Adrian Buehlmann
|
r12608 | | | | ||
Nicolas Dumazet
|
r14119 | | | o 5: 'G' | ||
| |/| | ||||
| o | 4: 'F' | ||||
| | | | ||||
| | o 3: 'E' | ||||
| |/ | ||||
o | 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
Adrian Buehlmann
|
r12608 | |/ | ||
o 0: 'A' | ||||
$ cd .. | ||||
Nicolas Dumazet
|
r14119 | D onto F - intermediate point: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a2 | ||||
$ cd a2 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 3 -d 5 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 7: 'D' | ||
|\ | ||||
| | o 6: 'H' | ||||
| |/ | ||||
| | o 5: 'G' | ||||
| |/| | ||||
| o | 4: 'F' | ||||
| | | | ||||
| | o 3: 'E' | ||||
| |/ | ||||
o | 2: 'C' | ||||
Adrian Buehlmann
|
r12608 | | | | ||
Nicolas Dumazet
|
r14119 | o | 1: 'B' | ||
Adrian Buehlmann
|
r12608 | |/ | ||
o 0: 'A' | ||||
$ cd .. | ||||
Nicolas Dumazet
|
r14119 | E onto H - skip of G: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a3 | ||||
$ cd a3 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 4 -d 7 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 6: 'E' | ||
| | ||||
o 5: 'H' | ||||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | o 4: 'F' | ||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | | o 3: 'D' | ||
| | | ||||
| o 2: 'C' | ||||
| | | ||||
Adrian Buehlmann
|
r12608 | | o 1: 'B' | ||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
Nicolas Dumazet
|
r14119 | F onto E - rebase of a branching point (skip G): | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a4 | ||||
$ cd a4 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 5 -d 4 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 6: 'H' | ||
| | ||||
o 5: 'F' | ||||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | o 4: 'E' | ||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | | o 3: 'D' | ||
| | | ||||
| o 2: 'C' | ||||
| | | ||||
Adrian Buehlmann
|
r12608 | | o 1: 'B' | ||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
Nicolas Dumazet
|
r14119 | G onto H - merged revision having a parent in ancestors of target: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a5 | ||||
$ cd a5 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 6 -d 7 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 7: 'G' | ||
Adrian Buehlmann
|
r12608 | |\ | ||
Nicolas Dumazet
|
r14119 | | o 6: 'H' | ||
Adrian Buehlmann
|
r12608 | | | | ||
Nicolas Dumazet
|
r14119 | | o 5: 'F' | ||
| | | ||||
o | 4: 'E' | ||||
|/ | ||||
Adrian Buehlmann
|
r12608 | | o 3: 'D' | ||
| | | ||||
Nicolas Dumazet
|
r14119 | | o 2: 'C' | ||
| | | ||||
Adrian Buehlmann
|
r12608 | | o 1: 'B' | ||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
Nicolas Dumazet
|
r14119 | F onto B - G maintains E as parent: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a6 | ||||
$ cd a6 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 5 -d 1 | ||
Mads Kiilerich
|
r12640 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) | ||
Adrian Buehlmann
|
r12608 | |||
$ hg tglog | ||||
Nicolas Dumazet
|
r14119 | @ 7: 'H' | ||
Adrian Buehlmann
|
r12608 | | | ||
Nicolas Dumazet
|
r14119 | | o 6: 'G' | ||
Adrian Buehlmann
|
r12608 | |/| | ||
Nicolas Dumazet
|
r14119 | o | 5: 'F' | ||
| | | ||||
| o 4: 'E' | ||||
Adrian Buehlmann
|
r12608 | | | | ||
Nicolas Dumazet
|
r14119 | | | o 3: 'D' | ||
| | | | ||||
+---o 2: 'C' | ||||
Adrian Buehlmann
|
r12608 | | | | ||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
These will fail (using --source): | ||||
Nicolas Dumazet
|
r14119 | G onto F - rebase onto an ancestor: | ||
Adrian Buehlmann
|
r12608 | |||
$ hg clone -q -u . a a7 | ||||
$ cd a7 | ||||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 6 -d 5 | ||
Pierre-Yves David
|
r15267 | nothing to rebase | ||
[1] | ||||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | F onto G - rebase onto a descendant: | ||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 5 -d 6 | ||
Adrian Buehlmann
|
r12608 | abort: source is ancestor of destination | ||
[255] | ||||
Nicolas Dumazet
|
r14119 | G onto B - merge revision with both parents not in ancestors of target: | ||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | $ hg rebase -s 6 -d 1 | ||
abort: cannot use revision 6 as base, result would have 3 parents | ||||
Adrian Buehlmann
|
r12608 | [255] | ||
These will abort gracefully (using --base): | ||||
Nicolas Dumazet
|
r14119 | G onto G - rebase onto same changeset: | ||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | $ hg rebase -b 6 -d 6 | ||
Adrian Buehlmann
|
r12608 | nothing to rebase | ||
[1] | ||||
Nicolas Dumazet
|
r14119 | G onto F - rebase onto an ancestor: | ||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | $ hg rebase -b 6 -d 5 | ||
Adrian Buehlmann
|
r12608 | nothing to rebase | ||
[1] | ||||
Nicolas Dumazet
|
r14119 | F onto G - rebase onto a descendant: | ||
Adrian Buehlmann
|
r12608 | |||
Nicolas Dumazet
|
r14119 | $ hg rebase -b 5 -d 6 | ||
Adrian Buehlmann
|
r12608 | nothing to rebase | ||
[1] | ||||
Pierre-Yves David
|
r15132 | C onto A - rebase onto an ancestor: | ||
$ hg rebase -d 0 -s 2 | ||||
Mads Kiilerich
|
r15447 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) | ||
Pierre-Yves David
|
r15132 | $ hg tglog | ||
@ 7: 'D' | ||||
| | ||||
o 6: 'C' | ||||
| | ||||
| o 5: 'H' | ||||
| | | ||||
| | o 4: 'G' | ||||
| |/| | ||||
| o | 3: 'F' | ||||
|/ / | ||||
| o 2: 'E' | ||||
|/ | ||||
| o 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
Pierre-Yves David
|
r15742 | |||
Check rebasing public changeset | ||||
$ hg pull --config phases.publish=True -q -r 6 . # update phase of 6 | ||||
$ hg rebase -d 5 -b 6 | ||||
abort: Can't rebase immutable changeset e1c4361dd923 | ||||
(see hg help phases for details) | ||||
[255] | ||||
$ hg rebase -d 5 -b 6 --keep | ||||
Pierre-Yves David
|
r15270 | $ cd .. | ||
Pierre-Yves David
|
r15132 | |||
Pierre-Yves David
|
r15270 | Test for revset | ||
We need a bit different graph | ||||
All destination are B | ||||
$ hg init ah | ||||
$ cd ah | ||||
$ hg unbundle $TESTDIR/bundles/rebase-revset.hg | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 9 changesets with 9 changes to 9 files (+2 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg tglog | ||||
o 8: 'I' | ||||
| | ||||
o 7: 'H' | ||||
| | ||||
o 6: 'G' | ||||
| | ||||
| o 5: 'F' | ||||
| | | ||||
| o 4: 'E' | ||||
|/ | ||||
o 3: 'D' | ||||
| | ||||
o 2: 'C' | ||||
| | ||||
| o 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
Simple case with keep: | ||||
Source on have two descendant heads but ask for one | ||||
$ hg clone -q -u . ah ah1 | ||||
$ cd ah1 | ||||
$ hg rebase -r '2::8' -d 1 | ||||
abort: can't remove original changesets with unrebased descendants | ||||
(use --keep to keep original changesets) | ||||
[255] | ||||
$ hg rebase -r '2::8' -d 1 --keep | ||||
$ hg tglog | ||||
@ 13: 'I' | ||||
| | ||||
o 12: 'H' | ||||
| | ||||
o 11: 'G' | ||||
| | ||||
o 10: 'D' | ||||
| | ||||
o 9: 'C' | ||||
| | ||||
| o 8: 'I' | ||||
| | | ||||
| o 7: 'H' | ||||
| | | ||||
| o 6: 'G' | ||||
| | | ||||
| | o 5: 'F' | ||||
| | | | ||||
| | o 4: 'E' | ||||
| |/ | ||||
| o 3: 'D' | ||||
| | | ||||
| o 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
Base on have one descendant heads we ask for but common ancestor have two | ||||
$ hg clone -q -u . ah ah2 | ||||
$ cd ah2 | ||||
$ hg rebase -r '3::8' -d 1 | ||||
abort: can't remove original changesets with unrebased descendants | ||||
(use --keep to keep original changesets) | ||||
[255] | ||||
$ hg rebase -r '3::8' -d 1 --keep | ||||
$ hg tglog | ||||
@ 12: 'I' | ||||
| | ||||
o 11: 'H' | ||||
| | ||||
o 10: 'G' | ||||
| | ||||
o 9: 'D' | ||||
|\ | ||||
| | o 8: 'I' | ||||
| | | | ||||
| | o 7: 'H' | ||||
| | | | ||||
| | o 6: 'G' | ||||
| | | | ||||
| | | o 5: 'F' | ||||
| | | | | ||||
| | | o 4: 'E' | ||||
| | |/ | ||||
| | o 3: 'D' | ||||
| |/ | ||||
| o 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
rebase subset | ||||
$ hg clone -q -u . ah ah3 | ||||
$ cd ah3 | ||||
$ hg rebase -r '3::7' -d 1 | ||||
abort: can't remove original changesets with unrebased descendants | ||||
(use --keep to keep original changesets) | ||||
[255] | ||||
$ hg rebase -r '3::7' -d 1 --keep | ||||
$ hg tglog | ||||
@ 11: 'H' | ||||
| | ||||
o 10: 'G' | ||||
| | ||||
o 9: 'D' | ||||
|\ | ||||
| | o 8: 'I' | ||||
| | | | ||||
| | o 7: 'H' | ||||
| | | | ||||
| | o 6: 'G' | ||||
| | | | ||||
| | | o 5: 'F' | ||||
| | | | | ||||
| | | o 4: 'E' | ||||
| | |/ | ||||
| | o 3: 'D' | ||||
| |/ | ||||
| o 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
rebase subset with multiple head | ||||
$ hg clone -q -u . ah ah4 | ||||
$ cd ah4 | ||||
$ hg rebase -r '3::(7+5)' -d 1 | ||||
abort: can't remove original changesets with unrebased descendants | ||||
(use --keep to keep original changesets) | ||||
[255] | ||||
$ hg rebase -r '3::(7+5)' -d 1 --keep | ||||
$ hg tglog | ||||
@ 13: 'H' | ||||
| | ||||
o 12: 'G' | ||||
| | ||||
| o 11: 'F' | ||||
| | | ||||
| o 10: 'E' | ||||
|/ | ||||
o 9: 'D' | ||||
|\ | ||||
| | o 8: 'I' | ||||
| | | | ||||
| | o 7: 'H' | ||||
| | | | ||||
| | o 6: 'G' | ||||
| | | | ||||
| | | o 5: 'F' | ||||
| | | | | ||||
| | | o 4: 'E' | ||||
| | |/ | ||||
| | o 3: 'D' | ||||
| |/ | ||||
| o 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
More advanced tests | ||||
rebase on ancestor with revset | ||||
$ hg clone -q -u . ah ah5 | ||||
$ cd ah5 | ||||
$ hg rebase -r '6::' -d 2 | ||||
Mads Kiilerich
|
r15447 | saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) | ||
Pierre-Yves David
|
r15270 | $ hg tglog | ||
@ 8: 'I' | ||||
| | ||||
o 7: 'H' | ||||
| | ||||
o 6: 'G' | ||||
| | ||||
| o 5: 'F' | ||||
| | | ||||
| o 4: 'E' | ||||
| | | ||||
| o 3: 'D' | ||||
|/ | ||||
o 2: 'C' | ||||
| | ||||
| o 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||
rebase with multiple root. | ||||
We rebase E and G on B | ||||
We would expect heads are I, F if it was supported | ||||
$ hg clone -q -u . ah ah6 | ||||
$ cd ah6 | ||||
$ hg rebase -r '(4+6)::' -d 1 | ||||
abort: can't rebase multiple roots | ||||
[255] | ||||
$ cd .. | ||||