test-rebase-issue-noparam-single-rev.t
130 lines
| 1.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-issue-noparam-single-rev.t
|
r12608 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r12608 | > [alias] | ||
|
r35386 | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||
|
r12608 | > EOF | ||
$ hg init a | ||||
$ cd a | ||||
$ echo c1 > c1 | ||||
$ hg ci -Am c1 | ||||
adding c1 | ||||
$ echo c2 > c2 | ||||
$ hg ci -Am c2 | ||||
adding c2 | ||||
$ echo l1 > l1 | ||||
$ hg ci -Am l1 | ||||
adding l1 | ||||
$ hg up -q -C 1 | ||||
$ echo r1 > r1 | ||||
$ hg ci -Am r1 | ||||
adding r1 | ||||
created new head | ||||
$ echo r2 > r2 | ||||
$ hg ci -Am r2 | ||||
adding r2 | ||||
$ hg tglog | ||||
|
r35386 | @ 4: 225af64d03e6 'r2' | ||
|
r12608 | | | ||
|
r35386 | o 3: 8d0a8c99b309 'r1' | ||
|
r12608 | | | ||
|
r35386 | | o 2: 87c180a611f2 'l1' | ||
|
r12608 | |/ | ||
|
r35386 | o 1: 56daeba07f4b 'c2' | ||
|
r12608 | | | ||
|
r35386 | o 0: e8faad3d03ff 'c1' | ||
|
r12608 | |||
Rebase with no arguments - single revision in source branch: | ||||
$ hg up -q -C 2 | ||||
$ hg rebase | ||||
|
r23517 | rebasing 2:87c180a611f2 "l1" | ||
|
r35394 | saved backup bundle to $TESTTMP/a/.hg/strip-backup/87c180a611f2-a5be192d-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 4: b1152cc99655 'l1' | ||
|
r12608 | | | ||
|
r35386 | o 3: 225af64d03e6 'r2' | ||
|
r12608 | | | ||
|
r35386 | o 2: 8d0a8c99b309 'r1' | ||
|
r12608 | | | ||
|
r35386 | o 1: 56daeba07f4b 'c2' | ||
|
r12608 | | | ||
|
r35386 | o 0: e8faad3d03ff 'c1' | ||
|
r12608 | |||
$ cd .. | ||||
$ hg init b | ||||
$ cd b | ||||
$ echo c1 > c1 | ||||
$ hg ci -Am c1 | ||||
adding c1 | ||||
$ echo c2 > c2 | ||||
$ hg ci -Am c2 | ||||
adding c2 | ||||
$ echo l1 > l1 | ||||
$ hg ci -Am l1 | ||||
adding l1 | ||||
$ echo l2 > l2 | ||||
$ hg ci -Am l2 | ||||
adding l2 | ||||
$ hg up -q -C 1 | ||||
$ echo r1 > r1 | ||||
$ hg ci -Am r1 | ||||
adding r1 | ||||
created new head | ||||
$ hg tglog | ||||
|
r35386 | @ 4: 8d0a8c99b309 'r1' | ||
|
r12608 | | | ||
|
r35386 | | o 3: 1ac923b736ef 'l2' | ||
|
r12608 | | | | ||
|
r35386 | | o 2: 87c180a611f2 'l1' | ||
|
r12608 | |/ | ||
|
r35386 | o 1: 56daeba07f4b 'c2' | ||
|
r12608 | | | ||
|
r35386 | o 0: e8faad3d03ff 'c1' | ||
|
r12608 | |||
Rebase with no arguments - single revision in target branch: | ||||
$ hg up -q -C 3 | ||||
$ hg rebase | ||||
|
r23517 | rebasing 2:87c180a611f2 "l1" | ||
rebasing 3:1ac923b736ef "l2" | ||||
|
r35394 | saved backup bundle to $TESTTMP/b/.hg/strip-backup/87c180a611f2-b980535c-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 4: 023181307ed0 'l2' | ||
|
r12608 | | | ||
|
r35386 | o 3: 913ab52b43b4 'l1' | ||
|
r12608 | | | ||
|
r35386 | o 2: 8d0a8c99b309 'r1' | ||
|
r12608 | | | ||
|
r35386 | o 1: 56daeba07f4b 'c2' | ||
|
r12608 | | | ||
|
r35386 | o 0: e8faad3d03ff 'c1' | ||
|
r12608 | |||
|
r16913 | |||
$ cd .. | ||||