--- a/tests/test-rebase-scenario-global.t Sun Dec 07 20:04:45 2014 +0100
+++ b/tests/test-rebase-scenario-global.t Tue Dec 09 03:45:26 2014 +0100
@@ -51,6 +51,7 @@
$ hg status --rev "3^1" --rev 3
A D
$ HGEDITOR=cat hg rebase -s 3 -d 7 --edit
+ rebasing 3:32af7686d403 "D"
D
@@ -89,6 +90,7 @@
$ cd a2
$ HGEDITOR=cat hg rebase -s 3 -d 5
+ rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/32af7686d403-backup.hg (glob)
$ hg tglog
@@ -117,6 +119,8 @@
$ cd a3
$ hg rebase -s 4 -d 7
+ rebasing 4:9520eea781bc "E"
+ rebasing 6:eea13746799a "G"
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
$ hg tglog
@@ -143,6 +147,9 @@
$ cd a4
$ hg rebase -s 5 -d 4
+ rebasing 5:24b6387c8c8c "F"
+ rebasing 6:eea13746799a "G"
+ rebasing 7:02de42196ebe "H" (tip)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
$ hg tglog
@@ -169,6 +176,7 @@
$ cd a5
$ hg rebase -s 6 -d 7
+ rebasing 6:eea13746799a "G"
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/eea13746799a-backup.hg (glob)
$ hg tglog
@@ -197,6 +205,9 @@
$ cd a6
$ hg rebase -s 5 -d 1
+ rebasing 5:24b6387c8c8c "F"
+ rebasing 6:eea13746799a "G"
+ rebasing 7:02de42196ebe "H" (tip)
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)
$ hg tglog
@@ -239,6 +250,7 @@
G onto B - merge revision with both parents not in ancestors of target:
$ hg rebase -s 6 -d 1
+ rebasing 6:eea13746799a "G"
abort: cannot use revision 6 as base, result would have 3 parents
[255]
@@ -266,6 +278,8 @@
C onto A - rebase onto an ancestor:
$ hg rebase -d 0 -s 2
+ rebasing 2:5fddd98957c8 "C"
+ rebasing 3:32af7686d403 "D"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob)
$ hg tglog
o 7: 'D'
@@ -297,32 +311,39 @@
[255]
$ hg rebase -d 5 -b 6 --keep
+ rebasing 6:e1c4361dd923 "C"
+ rebasing 7:c9659aac0000 "D" (tip)
Check rebasing mutable changeset
Source phase greater or equal to destination phase: new changeset get the phase of source:
$ hg id -n
5
$ hg rebase -s9 -d0
+ rebasing 9:2b23e52411f4 "D" (tip)
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob)
$ hg id -n # check we updated back to parent
5
$ hg log --template "{phase}\n" -r 9
draft
$ hg rebase -s9 -d1
+ rebasing 9:2cb10d0cfc6c "D" (tip)
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
draft
$ hg phase --force --secret 9
$ hg rebase -s9 -d0
+ rebasing 9:c5b12b67163a "D" (tip)
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
$ hg rebase -s9 -d1
+ rebasing 9:2a0524f868ac "D" (tip)
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob)
$ hg log --template "{phase}\n" -r 9
secret
Source phase lower than destination phase: new changeset get the phase of destination:
$ hg rebase -s8 -d9
+ rebasing 8:6d4f22462821 "C"
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob)
$ hg log --template "{phase}\n" -r 'rev(9)'
secret
@@ -375,6 +396,11 @@
(use --keep to keep original changesets)
[255]
$ hg rebase -r '2::8' -d 1 --keep
+ rebasing 2:c9e50f6cdc55 "C"
+ rebasing 3:ffd453c31098 "D"
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
+ rebasing 8:479ddb54a924 "I" (tip)
$ hg tglog
o 13: 'I'
|
@@ -416,6 +442,10 @@
(use --keep to keep original changesets)
[255]
$ hg rebase -r '3::8' -d 1 --keep
+ rebasing 3:ffd453c31098 "D"
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
+ rebasing 8:479ddb54a924 "I" (tip)
$ hg tglog
o 12: 'I'
|
@@ -455,6 +485,9 @@
(use --keep to keep original changesets)
[255]
$ hg rebase -r '3::7' -d 1 --keep
+ rebasing 3:ffd453c31098 "D"
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
$ hg tglog
o 11: 'H'
|
@@ -492,6 +525,11 @@
(use --keep to keep original changesets)
[255]
$ hg rebase -r '3::(7+5)' -d 1 --keep
+ rebasing 3:ffd453c31098 "D"
+ rebasing 4:c01897464e7f "E"
+ rebasing 5:41bfcc75ed73 "F"
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
$ hg tglog
o 13: 'H'
|
@@ -531,6 +569,9 @@
$ hg clone -q -u . ah ah5
$ cd ah5
$ hg rebase -r '6::' -d 2
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
+ rebasing 8:479ddb54a924 "I" (tip)
saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
$ hg tglog
o 8: 'I'
@@ -561,6 +602,11 @@
$ hg clone -q -u . ah ah6
$ cd ah6
$ hg rebase -r '(4+6)::' -d 1
+ rebasing 4:c01897464e7f "E"
+ rebasing 5:41bfcc75ed73 "F"
+ rebasing 6:3d8a618087a7 "G"
+ rebasing 7:72434a4e60b0 "H"
+ rebasing 8:479ddb54a924 "I" (tip)
saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob)
$ hg tglog
o 8: 'I'
@@ -628,6 +674,8 @@
(actual test)
$ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)'
+ rebasing 8:e7ec4e813ba6 "I"
+ rebasing 10:23a4ace37988 "K" (tip)
saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob)
$ hg log --rev 'children(desc(G))'
changeset: 9:adb617877056
@@ -690,4 +738,6 @@
$ hg add subfile
$ hg commit -m 'second source with subdir'
$ hg rebase -b . -d 1 --traceback
+ rebasing 2:779a07b1b7a0 "first source commit"
+ rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip)
saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-backup.hg (glob)