test-rebase-named-branches.t
85 lines
| 1.3 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-named-branches.t
|
r13733 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> graphlog= | ||||
> rebase= | ||||
> | ||||
> [alias] | ||||
> tglog = log -G --template "{rev}: '{desc}' {branches}\n" | ||||
> EOF | ||||
$ hg init a | ||||
$ cd a | ||||
|
r14118 | $ hg unbundle $TESTDIR/bundles/rebase.hg | ||
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 .. | ||
Rebasing descendant onto ancestor across different named branches | ||||
$ hg clone -q -u . a a1 | ||||
$ cd a1 | ||||
$ hg branch dev | ||||
marked working directory as branch dev | ||||
$ echo x > x | ||||
$ hg add x | ||||
$ hg ci -m 'extra named branch' | ||||
$ hg tglog | ||||
|
r14119 | @ 8: 'extra named branch' dev | ||
|
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' | ||
|/ | ||||
o 0: 'A' | ||||
|
r14120 | |||
$ hg rebase -s 7 -d 8 | ||||
abort: source is ancestor of destination | ||||
[255] | ||||
|
r14119 | $ hg rebase -s 8 -d 7 | ||
|
r13733 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) | ||
$ hg tglog | ||||
|
r14119 | @ 8: 'extra named branch' | ||
|
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' | ||
|/ | ||||
o 0: 'A' | ||||
$ cd .. | ||||