test-rebase-parameters.t
521 lines
| 10.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-rebase-parameters.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 | ||||
|
r16350 | $ hg unbundle "$TESTDIR/bundles/rebase.hg" | ||
|
r14122 | adding changesets | ||
adding manifests | ||||
adding file changes | ||||
added 8 changesets with 7 changes to 7 files (+2 heads) | ||||
|
r39516 | new changesets cd010b8cd998:02de42196ebe (8 drafts) | ||
|
r14122 | (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 | ||||
|
r12608 | |||
|
r14122 | $ echo I > I | ||
$ hg ci -AmI | ||||
adding I | ||||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 8: e7ec4e813ba6 'I' | ||
|
r12608 | | | ||
|
r35386 | o 7: 02de42196ebe 'H' | ||
|
r12608 | | | ||
|
r35386 | | o 6: eea13746799a 'G' | ||
|
r14122 | |/| | ||
|
r35386 | o | 5: 24b6387c8c8c 'F' | ||
|
r12608 | | | | ||
|
r35386 | | o 4: 9520eea781bc 'E' | ||
|
r12608 | |/ | ||
|
r35386 | | o 3: 32af7686d403 'D' | ||
|
r14122 | | | | ||
|
r35386 | | o 2: 5fddd98957c8 'C' | ||
|
r14122 | | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r14122 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r28100 | Version with only two heads (to allow default destination to work) | ||
$ hg clone -q -u . a a2heads -r 3 -r 8 | ||||
|
r12608 | |||
These fail: | ||||
|
r28100 | $ hg clone -q -u . a a0 | ||
$ cd a0 | ||||
|
r12608 | |||
|
r14123 | $ hg rebase -s 8 -d 7 | ||
|
r15267 | nothing to rebase | ||
[1] | ||||
|
r14123 | |||
|
r12608 | $ hg rebase --continue --abort | ||
|
r44351 | abort: cannot specify both --abort and --continue | ||
|
r12608 | [255] | ||
$ hg rebase --continue --collapse | ||||
abort: cannot use collapse with continue or abort | ||||
[255] | ||||
$ hg rebase --continue --dest 4 | ||||
|
r44383 | abort: cannot specify both --continue and --dest | ||
|
r12608 | [255] | ||
$ hg rebase --base 5 --source 4 | ||||
|
r44381 | abort: cannot specify both --source and --base | ||
|
r12608 | [255] | ||
|
r16550 | $ hg rebase --rev 5 --source 4 | ||
|
r44381 | abort: cannot specify both --rev and --source | ||
|
r16550 | [255] | ||
$ hg rebase --base 5 --rev 4 | ||||
|
r44381 | abort: cannot specify both --rev and --base | ||
|
r16550 | [255] | ||
|
r28190 | $ hg rebase --base 6 | ||
abort: branch 'default' has 3 heads - please rebase to an explicit rev | ||||
|
r43384 | (run 'hg heads .' to see heads, specify destination with -d) | ||
|
r28190 | [255] | ||
|
r28101 | $ hg rebase --rev '1 & !1' --dest 8 | ||
|
r21197 | empty "rev" revision set - nothing to rebase | ||
[1] | ||||
|
r20247 | |||
|
r28101 | $ hg rebase --source '1 & !1' --dest 8 | ||
|
r21210 | empty "source" revision set - nothing to rebase | ||
[1] | ||||
|
r20248 | |||
|
r28101 | $ hg rebase --base '1 & !1' --dest 8 | ||
|
r21210 | empty "base" revision set - can't compute rebase set | ||
[1] | ||||
|
r20249 | |||
|
r28101 | $ hg rebase --dest 8 | ||
|
r20249 | nothing to rebase - working directory parent is also destination | ||
[1] | ||||
|
r28101 | $ hg rebase -b . --dest 8 | ||
|
r20249 | nothing to rebase - e7ec4e813ba6 is both "base" and destination | ||
|
r12608 | [1] | ||
|
r14122 | $ hg up -q 7 | ||
|
r12608 | |||
|
r28101 | $ hg rebase --dest 8 --traceback | ||
|
r20249 | nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 | ||
[1] | ||||
|
r28101 | $ hg rebase --dest 8 -b. | ||
|
r20249 | nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 | ||
|
r12608 | [1] | ||
|
r20246 | $ hg rebase --dest '1 & !1' | ||
abort: empty revision set | ||||
[255] | ||||
|
r12608 | |||
These work: | ||||
|
r14122 | Rebase with no arguments (from 3 onto 8): | ||
|
r12608 | |||
|
r28100 | $ cd .. | ||
$ hg clone -q -u . a2heads a1 | ||||
$ cd a1 | ||||
|
r14122 | $ hg up -q -C 3 | ||
|
r12608 | |||
$ hg rebase | ||||
|
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 | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 6: ed65089c18f8 'D' | ||
|
r12608 | | | ||
|
r35386 | o 5: 7621bf1a2f17 'C' | ||
|
r12608 | | | ||
|
r35386 | o 4: 9430a62369c6 'B' | ||
|
r12608 | | | ||
|
r35386 | o 3: e7ec4e813ba6 'I' | ||
|
r12608 | | | ||
|
r35386 | o 2: 02de42196ebe 'H' | ||
|
r28100 | | | ||
|
r35386 | o 1: 24b6387c8c8c 'F' | ||
|
r28100 | | | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
Try to rollback after a rebase (fail): | ||||
$ hg rollback | ||||
no rollback information available | ||||
[1] | ||||
$ cd .. | ||||
|
r14122 | Rebase with base == '.' => same as no arguments (from 3 onto 8): | ||
|
r12608 | |||
|
r28100 | $ hg clone -q -u 3 a2heads a2 | ||
|
r12608 | $ cd a2 | ||
$ hg rebase --base . | ||||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a2/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 6: ed65089c18f8 'D' | ||
|
r12608 | | | ||
|
r35386 | o 5: 7621bf1a2f17 'C' | ||
|
r12608 | | | ||
|
r35386 | o 4: 9430a62369c6 'B' | ||
|
r12608 | | | ||
|
r35386 | o 3: e7ec4e813ba6 'I' | ||
|
r12608 | | | ||
|
r35386 | o 2: 02de42196ebe 'H' | ||
|
r28100 | | | ||
|
r35386 | o 1: 24b6387c8c8c 'F' | ||
|
r28100 | | | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r16566 | Rebase with dest == branch(.) => same as no arguments (from 3 onto 8): | ||
|
r12608 | |||
|
r14122 | $ hg clone -q -u 3 a a3 | ||
|
r12608 | $ cd a3 | ||
|
r16566 | $ hg rebase --dest 'branch(.)' | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 8: ed65089c18f8 'D' | ||
|
r12608 | | | ||
|
r35386 | o 7: 7621bf1a2f17 'C' | ||
|
r12608 | | | ||
|
r35386 | o 6: 9430a62369c6 'B' | ||
|
r12608 | | | ||
|
r35386 | o 5: e7ec4e813ba6 'I' | ||
|
r12608 | | | ||
|
r35386 | o 4: 02de42196ebe 'H' | ||
|
r12608 | | | ||
|
r35386 | | o 3: eea13746799a 'G' | ||
|
r14122 | |/| | ||
|
r35386 | o | 2: 24b6387c8c8c 'F' | ||
|
r14122 | | | | ||
|
r35386 | | o 1: 9520eea781bc 'E' | ||
|
r14122 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r14122 | Specify only source (from 2 onto 8): | ||
|
r12608 | |||
|
r28100 | $ hg clone -q -u . a2heads a4 | ||
|
r12608 | $ cd a4 | ||
|
r16550 | $ hg rebase --source 'desc("C")' | ||
|
r23517 | rebasing 2:5fddd98957c8 "C" | ||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | o 6: 7726e9fd58f7 'D' | ||
|
r12608 | | | ||
|
r35386 | o 5: 72c8333623d0 'C' | ||
|
r17005 | | | ||
|
r35386 | @ 4: e7ec4e813ba6 'I' | ||
|
r17005 | | | ||
|
r35386 | o 3: 02de42196ebe 'H' | ||
|
r28100 | | | ||
|
r35386 | o 2: 24b6387c8c8c 'F' | ||
|
r28100 | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r12608 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
Specify only dest (from 3 onto 6): | ||||
|
r14122 | $ hg clone -q -u 3 a a5 | ||
|
r12608 | $ cd a5 | ||
$ hg rebase --dest 6 | ||||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | @ 8: 8eeb3c33ad33 'D' | ||
|
r12608 | | | ||
|
r35386 | o 7: 2327fea05063 'C' | ||
|
r14122 | | | ||
|
r35386 | o 6: e4e5be0395b2 'B' | ||
|
r12608 | | | ||
|
r35386 | | o 5: e7ec4e813ba6 'I' | ||
|
r14122 | | | | ||
|
r35386 | | o 4: 02de42196ebe 'H' | ||
|
r14122 | | | | ||
|
r35386 | o | 3: eea13746799a 'G' | ||
|
r14122 | |\| | ||
|
r35386 | | o 2: 24b6387c8c8c 'F' | ||
|
r14122 | | | | ||
|
r35386 | o | 1: 9520eea781bc 'E' | ||
|
r12608 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r14122 | Specify only base (from 1 onto 8): | ||
|
r12608 | |||
|
r28100 | $ hg clone -q -u . a2heads a6 | ||
|
r12608 | $ cd a6 | ||
|
r16550 | $ hg rebase --base 'desc("D")' | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a6/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | o 6: ed65089c18f8 'D' | ||
|
r12608 | | | ||
|
r35386 | o 5: 7621bf1a2f17 'C' | ||
|
r12608 | | | ||
|
r35386 | o 4: 9430a62369c6 'B' | ||
|
r12608 | | | ||
|
r35386 | @ 3: e7ec4e813ba6 'I' | ||
|
r12608 | | | ||
|
r35386 | o 2: 02de42196ebe 'H' | ||
|
r28100 | | | ||
|
r35386 | o 1: 24b6387c8c8c 'F' | ||
|
r28100 | | | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r14122 | Specify source and dest (from 2 onto 7): | ||
|
r12608 | |||
$ hg clone -q -u . a a7 | ||||
$ cd a7 | ||||
|
r17005 | $ hg rebase --source 2 --dest 7 | ||
|
r23517 | rebasing 2:5fddd98957c8 "C" | ||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | o 8: 668acadedd30 'D' | ||
|
r14122 | | | ||
|
r35386 | o 7: 09eb682ba906 'C' | ||
|
r12608 | | | ||
|
r35386 | | @ 6: e7ec4e813ba6 'I' | ||
|
r14122 | |/ | ||
|
r35386 | o 5: 02de42196ebe 'H' | ||
|
r14122 | | | ||
|
r35386 | | o 4: eea13746799a 'G' | ||
|
r14122 | |/| | ||
|
r35386 | o | 3: 24b6387c8c8c 'F' | ||
|
r12608 | | | | ||
|
r35386 | | o 2: 9520eea781bc 'E' | ||
|
r12608 | |/ | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r14122 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r14122 | Specify base and dest (from 1 onto 7): | ||
|
r12608 | |||
$ hg clone -q -u . a a8 | ||||
$ cd a8 | ||||
|
r14122 | $ hg rebase --base 3 --dest 7 | ||
|
r23517 | rebasing 1:42ccdea3bb16 "B" | ||
rebasing 2:5fddd98957c8 "C" | ||||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a8/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg | ||
|
r12608 | |||
$ hg tglog | ||||
|
r35386 | o 8: 287cc92ba5a4 'D' | ||
|
r12608 | | | ||
|
r35386 | o 7: 6824f610a250 'C' | ||
|
r12608 | | | ||
|
r35386 | o 6: 7c6027df6a99 'B' | ||
|
r12608 | | | ||
|
r35386 | | @ 5: e7ec4e813ba6 'I' | ||
|
r12608 | |/ | ||
|
r35386 | o 4: 02de42196ebe 'H' | ||
|
r12608 | | | ||
|
r35386 | | o 3: eea13746799a 'G' | ||
|
r14122 | |/| | ||
|
r35386 | o | 2: 24b6387c8c8c 'F' | ||
|
r14122 | | | | ||
|
r35386 | | o 1: 9520eea781bc 'E' | ||
|
r14122 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r12608 | |||
$ cd .. | ||||
|
r16550 | |||
Specify only revs (from 2 onto 8) | ||||
|
r28100 | $ hg clone -q -u . a2heads a9 | ||
|
r16550 | $ cd a9 | ||
$ hg rebase --rev 'desc("C")::' | ||||
|
r23517 | rebasing 2:5fddd98957c8 "C" | ||
rebasing 3:32af7686d403 "D" | ||||
|
r35394 | saved backup bundle to $TESTTMP/a9/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg | ||
|
r16550 | |||
$ hg tglog | ||||
|
r35386 | o 6: 7726e9fd58f7 'D' | ||
|
r16550 | | | ||
|
r35386 | o 5: 72c8333623d0 'C' | ||
|
r17005 | | | ||
|
r35386 | @ 4: e7ec4e813ba6 'I' | ||
|
r17005 | | | ||
|
r35386 | o 3: 02de42196ebe 'H' | ||
|
r28100 | | | ||
|
r35386 | o 2: 24b6387c8c8c 'F' | ||
|
r28100 | | | ||
|
r35386 | | o 1: 42ccdea3bb16 'B' | ||
|
r16550 | |/ | ||
|
r35386 | o 0: cd010b8cd998 'A' | ||
|
r16550 | |||
$ cd .. | ||||
|
r27963 | Rebasing both a single revision and a merge in one command | ||
$ hg clone -q -u . a aX | ||||
$ cd aX | ||||
|
r28101 | $ hg rebase -r 3 -r 6 --dest 8 | ||
|
r27963 | rebasing 3:32af7686d403 "D" | ||
rebasing 6:eea13746799a "G" | ||||
|
r35394 | saved backup bundle to $TESTTMP/aX/.hg/strip-backup/eea13746799a-ad273fd6-rebase.hg | ||
|
r27963 | $ cd .. | ||
|
r13856 | Test --tool parameter: | ||
$ hg init b | ||||
$ cd b | ||||
$ echo c1 > c1 | ||||
$ hg ci -Am c1 | ||||
adding c1 | ||||
$ echo c2 > c2 | ||||
$ hg ci -Am c2 | ||||
adding c2 | ||||
$ hg up -q 0 | ||||
$ echo c2b > c2 | ||||
$ hg ci -Am c2b | ||||
adding c2 | ||||
created new head | ||||
$ cd .. | ||||
$ hg clone -q -u . b b1 | ||||
$ cd b1 | ||||
$ hg rebase -s 2 -d 1 --tool internal:local | ||||
|
r23517 | rebasing 2:e4e3f3546619 "c2b" (tip) | ||
|
r40900 | note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes | ||
|
r35394 | saved backup bundle to $TESTTMP/b1/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg | ||
|
r13856 | |||
$ hg cat c2 | ||||
c2 | ||||
$ cd .. | ||||
$ hg clone -q -u . b b2 | ||||
$ cd b2 | ||||
$ hg rebase -s 2 -d 1 --tool internal:other | ||||
|
r23517 | rebasing 2:e4e3f3546619 "c2b" (tip) | ||
|
r35394 | saved backup bundle to $TESTTMP/b2/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg | ||
|
r13856 | |||
$ hg cat c2 | ||||
c2b | ||||
$ cd .. | ||||
$ hg clone -q -u . b b3 | ||||
$ cd b3 | ||||
$ hg rebase -s 2 -d 1 --tool internal:fail | ||||
|
r23517 | rebasing 2:e4e3f3546619 "c2b" (tip) | ||
|
r18933 | unresolved conflicts (see hg resolve, then hg rebase --continue) | ||
|
r18935 | [1] | ||
|
r13856 | |||
|
r19213 | $ hg summary | ||
parent: 1:56daeba07f4b | ||||
c2 | ||||
parent: 2:e4e3f3546619 tip | ||||
c2b | ||||
branch: default | ||||
commit: 1 modified, 1 unresolved (merge) | ||||
update: (current) | ||||
|
r25382 | phases: 3 draft | ||
|
r19214 | rebase: 0 rebased, 1 remaining (rebase --continue) | ||
|
r19213 | |||
|
r13856 | $ hg resolve -l | ||
U c2 | ||||
$ hg resolve -m c2 | ||||
|
r21947 | (no more unresolved files) | ||
|
r27626 | continue: hg rebase --continue | ||
|
r28122 | $ hg graft --continue | ||
abort: no graft in progress | ||||
(continue: hg rebase --continue) | ||||
[255] | ||||
|
r13856 | $ hg rebase -c --tool internal:fail | ||
|
r23517 | rebasing 2:e4e3f3546619 "c2b" (tip) | ||
|
r40900 | note: not rebasing 2:e4e3f3546619 "c2b" (tip), its destination already has all its changes | ||
|
r35394 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-rebase.hg | ||
|
r13856 | |||
|
r22382 | $ hg rebase -i | ||
|
r26496 | abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") | ||
|
r22382 | [255] | ||
$ hg rebase --interactive | ||||
|
r26496 | abort: interactive history editing is supported by the 'histedit' extension (see "hg --config extensions.histedit= help -e histedit") | ||
|
r22382 | [255] | ||
|
r16913 | $ cd .. | ||
|
r23246 | |||
No common ancestor | ||||
$ hg init separaterepo | ||||
$ cd separaterepo | ||||
$ touch a | ||||
$ hg commit -Aqm a | ||||
$ hg up -q null | ||||
$ touch b | ||||
$ hg commit -Aqm b | ||||
$ hg rebase -d 0 | ||||
nothing to rebase from d7486e00c6f1 to 3903775176ed | ||||
[1] | ||||
$ cd .. | ||||