test-rebase-named-branches.t
410 lines
| 9.1 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-named-branches.t
|
r13733 | $ cat >> $HGRCPATH <<EOF | ||
> [extensions] | ||||
> rebase= | ||||
> | ||||
|
r15742 | > [phases] | ||
> publish=False | ||||
> | ||||
|
r13733 | > [alias] | ||
|
r35386 | > tglog = log -G --template "{rev}: {node|short} '{desc}' {branches}\n" | ||
|
r13733 | > 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) | ||
|
r39516 | new changesets cd010b8cd998:02de42196ebe (8 drafts) | ||
|
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 | ||||
|
r13733 | |||
$ echo x > x | ||||
$ hg add x | ||||
|
r15800 | $ hg ci -m 'dev-two named branch' | ||
$ hg tglog | ||||
|
r35386 | @ 9: cb039b7cae8e 'dev-two named branch' dev-two | ||
|
r15800 | | | ||
|
r35386 | | o 8: 643fc9128048 'dev-one named branch' dev-one | ||
|
r15800 | | | | ||
|
r35386 | o | 7: 02de42196ebe 'H' | ||
|
r15800 | | | | ||
|
r35386 | +---o 6: eea13746799a 'G' | ||
|
r15800 | | | | | ||
|
r35386 | o | | 5: 24b6387c8c8c 'F' | ||
|
r15800 | | | | | ||
|
r35386 | +---o 4: 9520eea781bc 'E' | ||
|
r15800 | | | | ||
|
r35386 | | o 3: 32af7686d403 'D' | ||
|
r15800 | | | | ||
|
r35386 | | o 2: 5fddd98957c8 'C' | ||
|
r15800 | | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r15800 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r15800 | |||
Branch name containing a dash (issue3181) | ||||
$ hg rebase -b dev-two -d dev-one --keepbranches | ||||
|
r23517 | rebasing 5:24b6387c8c8c "F" | ||
rebasing 6:eea13746799a "G" | ||||
rebasing 7:02de42196ebe "H" | ||||
rebasing 9:cb039b7cae8e "dev-two named branch" (tip) | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/24b6387c8c8c-24cb8001-rebase.hg | ||
|
r15800 | |||
$ hg tglog | ||||
|
r35386 | @ 9: 9e70cd31750f 'dev-two named branch' dev-two | ||
|
r15800 | | | ||
|
r35386 | o 8: 31d0e4ba75e6 'H' | ||
|
r15800 | | | ||
|
r35386 | | o 7: 4b988a958030 'G' | ||
|
r15800 | |/| | ||
|
r35386 | o | 6: 24de4aff8e28 'F' | ||
|
r15800 | | | | ||
|
r35386 | o | 5: 643fc9128048 'dev-one named branch' dev-one | ||
|
r15800 | | | | ||
|
r35386 | | o 4: 9520eea781bc 'E' | ||
|
r15800 | | | | ||
|
r35386 | o | 3: 32af7686d403 'D' | ||
|
r15800 | | | | ||
|
r35386 | o | 2: 5fddd98957c8 'C' | ||
|
r15800 | | | | ||
|
r35386 | o | 1: 42ccdea3bb16 'B' | ||
|
r15800 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r15800 | |||
$ hg rebase -s dev-one -d 0 --keepbranches | ||||
|
r23517 | rebasing 5:643fc9128048 "dev-one named branch" | ||
rebasing 6:24de4aff8e28 "F" | ||||
rebasing 7:4b988a958030 "G" | ||||
rebasing 8:31d0e4ba75e6 "H" | ||||
rebasing 9:9e70cd31750f "dev-two named branch" (tip) | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-c4ee9ef5-rebase.hg | ||
|
r13733 | |||
$ hg tglog | ||||
|
r35386 | @ 9: 59c2e59309fe 'dev-two named branch' dev-two | ||
|
r15800 | | | ||
|
r35386 | o 8: 904590360559 'H' | ||
|
r15800 | | | ||
|
r35386 | | o 7: 1a1e6f72ec38 'G' | ||
|
r15800 | |/| | ||
|
r35386 | o | 6: 42aa3cf0fa7a 'F' | ||
|
r26360 | | | | ||
|
r35386 | o | 5: bc8139ee757c 'dev-one named branch' dev-one | ||
|
r15800 | | | | ||
|
r35386 | | o 4: 9520eea781bc 'E' | ||
|
r15800 | |/ | ||
|
r35386 | | o 3: 32af7686d403 'D' | ||
|
r15800 | | | | ||
|
r35386 | | o 2: 5fddd98957c8 'C' | ||
|
r15800 | | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r15800 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r15800 | |||
$ hg update 3 | ||||
3 files updated, 0 files merged, 3 files removed, 0 files unresolved | ||||
|
r26360 | $ hg branch -f dev-one | ||
|
r15800 | marked working directory as branch dev-one | ||
$ hg ci -m 'dev-one named branch' | ||||
|
r26360 | created new head | ||
|
r15800 | |||
$ hg tglog | ||||
|
r35386 | @ 10: 643fc9128048 'dev-one named branch' dev-one | ||
|
r15800 | | | ||
|
r35386 | | o 9: 59c2e59309fe 'dev-two named branch' dev-two | ||
|
r26360 | | | | ||
|
r35386 | | o 8: 904590360559 'H' | ||
|
r15800 | | | | ||
|
r35386 | | | o 7: 1a1e6f72ec38 'G' | ||
|
r15800 | | |/| | ||
|
r35386 | | o | 6: 42aa3cf0fa7a 'F' | ||
|
r26360 | | | | | ||
|
r35386 | | o | 5: bc8139ee757c 'dev-one named branch' dev-one | ||
|
r15800 | | | | | ||
|
r35386 | | | o 4: 9520eea781bc 'E' | ||
|
r15800 | | |/ | ||
|
r35386 | o | 3: 32af7686d403 'D' | ||
|
r15800 | | | | ||
|
r35386 | o | 2: 5fddd98957c8 'C' | ||
|
r15800 | | | | ||
|
r35386 | o | 1: 42ccdea3bb16 'B' | ||
|
r15800 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r15800 | |||
$ hg rebase -b 'max(branch("dev-two"))' -d dev-one --keepbranches | ||||
|
r26360 | rebasing 5:bc8139ee757c "dev-one named branch" | ||
|
r40899 | note: rebase of 5:bc8139ee757c "dev-one named branch" created no changes to commit | ||
|
r26360 | rebasing 6:42aa3cf0fa7a "F" | ||
rebasing 7:1a1e6f72ec38 "G" | ||||
rebasing 8:904590360559 "H" | ||||
rebasing 9:59c2e59309fe "dev-two named branch" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/bc8139ee757c-f11c1080-rebase.hg | ||
|
r15800 | |||
$ hg tglog | ||||
|
r35386 | o 9: 71325f8bc082 'dev-two named branch' dev-two | ||
|
r15800 | | | ||
|
r35386 | o 8: 12b2bc666e20 'H' | ||
|
r15800 | | | ||
|
r35386 | | o 7: 549f007a9f5f 'G' | ||
|
r15800 | |/| | ||
|
r35386 | o | 6: 679f28760620 'F' | ||
|
r15800 | | | | ||
|
r35386 | @ | 5: 643fc9128048 'dev-one named branch' dev-one | ||
|
r15800 | | | | ||
|
r35386 | | o 4: 9520eea781bc 'E' | ||
|
r15800 | | | | ||
|
r35386 | o | 3: 32af7686d403 'D' | ||
|
r15800 | | | | ||
|
r35386 | o | 2: 5fddd98957c8 'C' | ||
|
r15800 | | | | ||
|
r35386 | o | 1: 42ccdea3bb16 'B' | ||
|
r15800 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r15800 | |||
$ hg rebase -s 'max(branch("dev-one"))' -d 0 --keepbranches | ||||
|
r23517 | rebasing 5:643fc9128048 "dev-one named branch" | ||
|
r26360 | rebasing 6:679f28760620 "F" | ||
rebasing 7:549f007a9f5f "G" | ||||
rebasing 8:12b2bc666e20 "H" | ||||
rebasing 9:71325f8bc082 "dev-two named branch" (tip) | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/643fc9128048-6cdd1a52-rebase.hg | ||
|
r15800 | |||
$ hg tglog | ||||
|
r35386 | o 9: 3944801ae4ea 'dev-two named branch' dev-two | ||
|
r13733 | | | ||
|
r35386 | o 8: 8e279d293175 'H' | ||
|
r13733 | | | ||
|
r35386 | | o 7: aeefee77ab01 'G' | ||
|
r13733 | |/| | ||
|
r35386 | o | 6: e908b85f3729 'F' | ||
|
r26360 | | | | ||
|
r35386 | @ | 5: bc8139ee757c 'dev-one named branch' dev-one | ||
|
r14119 | | | | ||
|
r35386 | | o 4: 9520eea781bc 'E' | ||
|
r14119 | |/ | ||
|
r35386 | | o 3: 32af7686d403 'D' | ||
|
r13733 | | | | ||
|
r35386 | | o 2: 5fddd98957c8 'C' | ||
|
r14119 | | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r13733 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r13733 | |||
|
r26360 | $ hg up -r 0 > /dev/null | ||
|
r14120 | |||
|
r15800 | Rebasing descendant onto ancestor across different named branches | ||
|
r14120 | |||
|
r26360 | $ hg rebase -s 1 -d 9 --keepbranches | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r13733 | |||
$ hg tglog | ||||
|
r35386 | o 9: e9f862ce8bad 'D' | ||
|
r26360 | | | ||
|
r35386 | o 8: a0d543090fa4 'C' | ||
|
r13733 | | | ||
|
r35386 | o 7: 3bdb949809d9 'B' | ||
|
r14124 | | | ||
|
r35386 | o 6: 3944801ae4ea 'dev-two named branch' dev-two | ||
|
r13733 | | | ||
|
r35386 | o 5: 8e279d293175 'H' | ||
|
r14124 | | | ||
|
r35386 | | o 4: aeefee77ab01 'G' | ||
|
r13733 | |/| | ||
|
r35386 | o | 3: e908b85f3729 'F' | ||
|
r26360 | | | | ||
|
r35386 | o | 2: bc8139ee757c 'dev-one named branch' dev-one | ||
|
r14119 | | | | ||
|
r35386 | | o 1: 9520eea781bc 'E' | ||
|
r14119 | |/ | ||
|
r35386 | @ 0: cd010b8cd998 'A' | ||
|
r14124 | |||
|
r26360 | $ hg rebase -s 5 -d 6 | ||
|
r34008 | abort: source and destination form a cycle | ||
|
r14124 | [255] | ||
|
r26360 | $ hg rebase -s 6 -d 5 | ||
rebasing 6:3944801ae4ea "dev-two named branch" | ||||
rebasing 7:3bdb949809d9 "B" | ||||
rebasing 8:a0d543090fa4 "C" | ||||
rebasing 9:e9f862ce8bad "D" (tip) | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/3944801ae4ea-fb46ed74-rebase.hg | ||
|
r14124 | |||
$ hg tglog | ||||
|
r35386 | o 9: e522577ccdbd 'D' | ||
|
r26360 | | | ||
|
r35386 | o 8: 810110211f50 'C' | ||
|
r14124 | | | ||
|
r35386 | o 7: 160b0930ccc6 'B' | ||
|
r14124 | | | ||
|
r35386 | o 6: c57724c84928 'dev-two named branch' | ||
|
r14124 | | | ||
|
r35386 | o 5: 8e279d293175 'H' | ||
|
r14124 | | | ||
|
r35386 | | o 4: aeefee77ab01 'G' | ||
|
r14124 | |/| | ||
|
r35386 | o | 3: e908b85f3729 'F' | ||
|
r26360 | | | | ||
|
r35386 | o | 2: bc8139ee757c 'dev-one named branch' dev-one | ||
|
r13733 | | | | ||
|
r35386 | | o 1: 9520eea781bc 'E' | ||
|
r13733 | |/ | ||
|
r35386 | @ 0: cd010b8cd998 'A' | ||
|
r13733 | |||
|
r21027 | |||
Reopen branch by rebase | ||||
$ hg up -qr3 | ||||
$ hg branch -q b | ||||
$ hg ci -m 'create b' | ||||
$ hg ci -m 'close b' --close | ||||
$ hg rebase -b 8 -d b | ||||
|
r26360 | reopening closed branch head 2b586e70108d | ||
rebasing 5:8e279d293175 "H" | ||||
rebasing 6:c57724c84928 "dev-two named branch" | ||||
rebasing 7:160b0930ccc6 "B" | ||||
rebasing 8:810110211f50 "C" | ||||
rebasing 9:e522577ccdbd "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a1/.hg/strip-backup/8e279d293175-b023e27c-rebase.hg | ||
|
r21027 | |||
|
r13733 | $ cd .. | ||
|
r20251 | |||
Rebase to other head on branch | ||||
Set up a case: | ||||
$ hg init case1 | ||||
$ cd case1 | ||||
$ touch f | ||||
$ hg ci -qAm0 | ||||
$ hg branch -q b | ||||
$ echo >> f | ||||
$ hg ci -qAm 'b1' | ||||
$ hg up -qr -2 | ||||
$ hg branch -qf b | ||||
$ hg ci -qm 'b2' | ||||
$ hg up -qr -3 | ||||
$ hg branch -q c | ||||
$ hg ci -m 'c1' | ||||
$ hg tglog | ||||
|
r35386 | @ 3: c062e3ecd6c6 'c1' c | ||
|
r20251 | | | ||
|
r35386 | | o 2: 792845bb77ee 'b2' b | ||
|
r20251 | |/ | ||
|
r35386 | | o 1: 40039acb7ca5 'b1' b | ||
|
r20251 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r20251 | |||
$ hg clone -q . ../case2 | ||||
rebase 'b2' to another lower branch head | ||||
$ hg up -qr 2 | ||||
$ hg rebase | ||||
|
r28189 | rebasing 2:792845bb77ee "b2" | ||
|
r40899 | note: rebase of 2:792845bb77ee "b2" created no changes to commit | ||
|
r35394 | saved backup bundle to $TESTTMP/case1/.hg/strip-backup/792845bb77ee-627120ee-rebase.hg | ||
|
r20251 | $ hg tglog | ||
|
r35386 | o 2: c062e3ecd6c6 'c1' c | ||
|
r20251 | | | ||
|
r35386 | | @ 1: 40039acb7ca5 'b1' b | ||
|
r20251 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r20251 | |||
rebase 'b1' on top of the tip of the branch ('b2') - ignoring the tip branch ('c1') | ||||
$ cd ../case2 | ||||
$ hg up -qr 1 | ||||
$ hg rebase | ||||
|
r23517 | rebasing 1:40039acb7ca5 "b1" | ||
|
r35394 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/40039acb7ca5-342b72d1-rebase.hg | ||
|
r20251 | $ hg tglog | ||
|
r35386 | @ 3: 76abc1c6f8c7 'b1' b | ||
|
r20251 | | | ||
|
r35386 | | o 2: c062e3ecd6c6 'c1' c | ||
|
r20251 | | | | ||
|
r35386 | o | 1: 792845bb77ee 'b2' b | ||
|
r20251 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r20251 | |||
rebase 'c1' to the branch head 'c2' that is closed | ||||
$ hg branch -qf c | ||||
$ hg ci -qm 'c2 closed' --close | ||||
$ hg up -qr 2 | ||||
$ hg tglog | ||||
|
r35386 | _ 4: 8427af5d86f2 'c2 closed' c | ||
|
r20251 | | | ||
|
r35386 | o 3: 76abc1c6f8c7 'b1' b | ||
|
r20251 | | | ||
|
r35386 | | @ 2: c062e3ecd6c6 'c1' c | ||
|
r20251 | | | | ||
|
r35386 | o | 1: 792845bb77ee 'b2' b | ||
|
r20251 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r20251 | |||
$ hg rebase | ||||
|
r28189 | abort: branch 'c' has one head - please rebase to an explicit rev | ||
(run 'hg heads' to see all heads) | ||||
[255] | ||||
|
r20251 | $ hg tglog | ||
|
r35386 | _ 4: 8427af5d86f2 'c2 closed' c | ||
|
r20251 | | | ||
|
r35386 | o 3: 76abc1c6f8c7 'b1' b | ||
|
r20251 | | | ||
|
r35386 | | @ 2: c062e3ecd6c6 'c1' c | ||
|
r20251 | | | | ||
|
r35386 | o | 1: 792845bb77ee 'b2' b | ||
|
r20251 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r20251 | |||
|
r31380 | $ hg up -cr 1 | ||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg branch x | ||||
marked working directory as branch x | ||||
$ hg rebase -r 3:: -d . | ||||
rebasing 3:76abc1c6f8c7 "b1" | ||||
rebasing 4:8427af5d86f2 "c2 closed" (tip) | ||||
|
r40899 | note: rebase of 4:8427af5d86f2 "c2 closed" (tip) created no changes to commit | ||
|
r35394 | saved backup bundle to $TESTTMP/case2/.hg/strip-backup/76abc1c6f8c7-cd698d13-rebase.hg | ||
|
r31380 | $ hg tglog | ||
|
r35386 | o 3: 117b0ed08075 'b1' x | ||
|
r31380 | | | ||
|
r35386 | | o 2: c062e3ecd6c6 'c1' c | ||
|
r31380 | | | | ||
|
r35386 | @ | 1: 792845bb77ee 'b2' b | ||
|
r31380 | |/ | ||
|
r35386 | o 0: d681519c3ea7 '0' | ||
|
r31380 | |||
|
r20251 | $ cd .. | ||