test-rebase-named-branches.t
242 lines
| 4.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-named-branches.t
|
r13733 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r13733 | > [alias] | ||
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" | ||||
> EOF | ||||
$ hg init a | ||||
$ cd a | ||||
|
r16350 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||
|
r14118 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
|
r14119 | added 8 changesets with 7 changes to 7 files (+2 heads) | ||
|
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 | ||||
|
r13733 | $ cd .. | ||
$ hg clone -q -u . a a1 | ||||
$ cd a1 | ||||
|
r15800 | $ hg update 3 | ||
3 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ hg branch dev-one | ||||
marked working directory as branch dev-one | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg ci -m 'dev-one named branch' | ||||
$ hg update 7 | ||||
2 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
$ hg branch dev-two | ||||
marked working directory as branch dev-two | ||||
|
r15615 | (branches are permanent and global, did you want a bookmark?) | ||
|
r13733 | |||
$ echo x > x | ||||
$ hg add x | ||||
|
r15800 | $ hg ci -m 'dev-two named branch' | ||
$ hg tglog | ||||
@ 9: 'dev-two named branch' dev-two | ||||
| | ||||
| o 8: 'dev-one named branch' dev-one | ||||
| | | ||||
o | 7: 'H' | ||||
| | | ||||
+---o 6: 'G' | ||||
| | | | ||||
o | | 5: 'F' | ||||
| | | | ||||
+---o 4: 'E' | ||||
| | | ||||
| o 3: 'D' | ||||
| | | ||||
| o 2: 'C' | ||||
| | | ||||
| o 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
Branch name containing a dash (issue3181) | ||||
$ hg rebase -b dev-two -d dev-one --keepbranches | ||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
@ 9: 'dev-two named branch' dev-two | ||||
| | ||||
o 8: 'H' | ||||
| | ||||
| o 7: 'G' | ||||
|/| | ||||
o | 6: 'F' | ||||
| | | ||||
o | 5: 'dev-one named branch' dev-one | ||||
| | | ||||
| o 4: 'E' | ||||
| | | ||||
o | 3: 'D' | ||||
| | | ||||
o | 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ hg rebase -s dev-one -d 0 --keepbranches | ||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||||
|
r13733 | |||
$ hg tglog | ||||
|
r15800 | @ 8: 'dev-two named branch' dev-two | ||
| | ||||
o 7: 'H' | ||||
| | ||||
| o 6: 'G' | ||||
|/| | ||||
o | 5: 'F' | ||||
| | | ||||
| o 4: 'E' | ||||
|/ | ||||
| o 3: 'D' | ||||
| | | ||||
| o 2: 'C' | ||||
| | | ||||
| o 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ hg update 3 | ||||
3 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
$ hg branch dev-one | ||||
marked working directory as branch dev-one | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg ci -m 'dev-one named branch' | ||||
$ hg tglog | ||||
@ 9: 'dev-one named branch' dev-one | ||||
| | ||||
| o 8: 'dev-two named branch' dev-two | ||||
| | | ||||
| o 7: 'H' | ||||
| | | ||||
| | o 6: 'G' | ||||
| |/| | ||||
| o | 5: 'F' | ||||
| | | | ||||
| | o 4: 'E' | ||||
| |/ | ||||
o | 3: 'D' | ||||
| | | ||||
o | 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches | ||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
|
r19925 | o 9: 'dev-two named branch' dev-two | ||
|
r15800 | | | ||
o 8: 'H' | ||||
| | ||||
| o 7: 'G' | ||||
|/| | ||||
o | 6: 'F' | ||||
| | | ||||
|
r19925 | @ | 5: 'dev-one named branch' dev-one | ||
|
r15800 | | | | ||
| o 4: 'E' | ||||
| | | ||||
o | 3: 'D' | ||||
| | | ||||
o | 2: 'C' | ||||
| | | ||||
o | 1: 'B' | ||||
|/ | ||||
o 0: 'A' | ||||
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches | ||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
|
r19925 | o 8: 'dev-two named branch' dev-two | ||
|
r13733 | | | ||
|
r14119 | o 7: 'H' | ||
|
r13733 | | | ||
|
r14119 | | o 6: 'G' | ||
|
r13733 | |/| | ||
|
r14119 | o | 5: 'F' | ||
| | | ||||
| o 4: 'E' | ||||
|/ | ||||
| o 3: 'D' | ||||
|
r13733 | | | | ||
| o 2: 'C' | ||||
|
r14119 | | | | ||
|
r13733 | | o 1: 'B' | ||
|/ | ||||
|
r19925 | @ 0: 'A' | ||
|
r13733 | |||
|
r14120 | |||
|
r15800 | Rebasing descendant onto ancestor across different named branches | ||
|
r14120 | |||
|
r14124 | $ hg rebase -s 1 -d 8 --keepbranches | ||
|
r13733 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||
$ hg tglog | ||||
|
r19925 | o 8: 'D' | ||
|
r13733 | | | ||
|
r14124 | o 7: 'C' | ||
| | ||||
o 6: 'B' | ||||
|
r13733 | | | ||
|
r15800 | o 5: 'dev-two named branch' dev-two | ||
|
r14124 | | | ||
o 4: 'H' | ||||
| | ||||
| o 3: 'G' | ||||
|
r13733 | |/| | ||
|
r14124 | o | 2: 'F' | ||
|
r14119 | | | | ||
|
r14124 | | o 1: 'E' | ||
|
r14119 | |/ | ||
|
r19925 | @ 0: 'A' | ||
|
r14124 | |||
$ hg rebase -s 4 -d 5 | ||||
abort: source is ancestor of destination | ||||
[255] | ||||
$ hg rebase -s 5 -d 4 | ||||
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||||
$ hg tglog | ||||
|
r19925 | o 8: 'D' | ||
|
r14124 | | | ||
o 7: 'C' | ||||
| | ||||
o 6: 'B' | ||||
| | ||||
|
r15800 | o 5: 'dev-two named branch' | ||
|
r14124 | | | ||
o 4: 'H' | ||||
| | ||||
| o 3: 'G' | ||||
|/| | ||||
o | 2: 'F' | ||||
|
r13733 | | | | ||
|
r14124 | | o 1: 'E' | ||
|
r13733 | |/ | ||
|
r19925 | @ 0: 'A' | ||
|
r13733 | |||
$ cd .. | ||||