120 |
120 |
121 $ hg rebase -s 4 -d 7 |
121 $ hg rebase -s 4 -d 7 |
122 rebasing 4:9520eea781bc "E" |
122 rebasing 4:9520eea781bc "E" |
123 rebasing 6:eea13746799a "G" |
123 rebasing 6:eea13746799a "G" |
124 note: rebase of 6:eea13746799a created no changes to commit |
124 note: rebase of 6:eea13746799a created no changes to commit |
125 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob) |
125 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-fcd8edd4-backup.hg (glob) |
126 |
126 |
127 $ hg tglog |
127 $ hg tglog |
128 o 6: 'E' |
128 o 6: 'E' |
129 | |
129 | |
130 @ 5: 'H' |
130 @ 5: 'H' |
150 $ hg rebase -s 5 -d 4 |
150 $ hg rebase -s 5 -d 4 |
151 rebasing 5:24b6387c8c8c "F" |
151 rebasing 5:24b6387c8c8c "F" |
152 rebasing 6:eea13746799a "G" |
152 rebasing 6:eea13746799a "G" |
153 note: rebase of 6:eea13746799a created no changes to commit |
153 note: rebase of 6:eea13746799a created no changes to commit |
154 rebasing 7:02de42196ebe "H" (tip) |
154 rebasing 7:02de42196ebe "H" (tip) |
155 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
155 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob) |
156 |
156 |
157 $ hg tglog |
157 $ hg tglog |
158 @ 6: 'H' |
158 @ 6: 'H' |
159 | |
159 | |
160 o 5: 'F' |
160 o 5: 'F' |
208 |
208 |
209 $ hg rebase -s 5 -d 1 |
209 $ hg rebase -s 5 -d 1 |
210 rebasing 5:24b6387c8c8c "F" |
210 rebasing 5:24b6387c8c8c "F" |
211 rebasing 6:eea13746799a "G" |
211 rebasing 6:eea13746799a "G" |
212 rebasing 7:02de42196ebe "H" (tip) |
212 rebasing 7:02de42196ebe "H" (tip) |
213 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-backup.hg (glob) |
213 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/24b6387c8c8c-c3fe765d-backup.hg (glob) |
214 |
214 |
215 $ hg tglog |
215 $ hg tglog |
216 @ 7: 'H' |
216 @ 7: 'H' |
217 | |
217 | |
218 | o 6: 'G' |
218 | o 6: 'G' |
280 C onto A - rebase onto an ancestor: |
280 C onto A - rebase onto an ancestor: |
281 |
281 |
282 $ hg rebase -d 0 -s 2 |
282 $ hg rebase -d 0 -s 2 |
283 rebasing 2:5fddd98957c8 "C" |
283 rebasing 2:5fddd98957c8 "C" |
284 rebasing 3:32af7686d403 "D" |
284 rebasing 3:32af7686d403 "D" |
285 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
285 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
286 $ hg tglog |
286 $ hg tglog |
287 o 7: 'D' |
287 o 7: 'D' |
288 | |
288 | |
289 o 6: 'C' |
289 o 6: 'C' |
290 | |
290 | |
320 Source phase greater or equal to destination phase: new changeset get the phase of source: |
320 Source phase greater or equal to destination phase: new changeset get the phase of source: |
321 $ hg id -n |
321 $ hg id -n |
322 5 |
322 5 |
323 $ hg rebase -s9 -d0 |
323 $ hg rebase -s9 -d0 |
324 rebasing 9:2b23e52411f4 "D" (tip) |
324 rebasing 9:2b23e52411f4 "D" (tip) |
325 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-backup.hg (glob) |
325 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2b23e52411f4-f942decf-backup.hg (glob) |
326 $ hg id -n # check we updated back to parent |
326 $ hg id -n # check we updated back to parent |
327 5 |
327 5 |
328 $ hg log --template "{phase}\n" -r 9 |
328 $ hg log --template "{phase}\n" -r 9 |
329 draft |
329 draft |
330 $ hg rebase -s9 -d1 |
330 $ hg rebase -s9 -d1 |
331 rebasing 9:2cb10d0cfc6c "D" (tip) |
331 rebasing 9:2cb10d0cfc6c "D" (tip) |
332 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-backup.hg (glob) |
332 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2cb10d0cfc6c-ddb0f256-backup.hg (glob) |
333 $ hg log --template "{phase}\n" -r 9 |
333 $ hg log --template "{phase}\n" -r 9 |
334 draft |
334 draft |
335 $ hg phase --force --secret 9 |
335 $ hg phase --force --secret 9 |
336 $ hg rebase -s9 -d0 |
336 $ hg rebase -s9 -d0 |
337 rebasing 9:c5b12b67163a "D" (tip) |
337 rebasing 9:c5b12b67163a "D" (tip) |
338 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-backup.hg (glob) |
338 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/c5b12b67163a-4e372053-backup.hg (glob) |
339 $ hg log --template "{phase}\n" -r 9 |
339 $ hg log --template "{phase}\n" -r 9 |
340 secret |
340 secret |
341 $ hg rebase -s9 -d1 |
341 $ hg rebase -s9 -d1 |
342 rebasing 9:2a0524f868ac "D" (tip) |
342 rebasing 9:2a0524f868ac "D" (tip) |
343 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-backup.hg (glob) |
343 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/2a0524f868ac-cefd8574-backup.hg (glob) |
344 $ hg log --template "{phase}\n" -r 9 |
344 $ hg log --template "{phase}\n" -r 9 |
345 secret |
345 secret |
346 Source phase lower than destination phase: new changeset get the phase of destination: |
346 Source phase lower than destination phase: new changeset get the phase of destination: |
347 $ hg rebase -s8 -d9 |
347 $ hg rebase -s8 -d9 |
348 rebasing 8:6d4f22462821 "C" |
348 rebasing 8:6d4f22462821 "C" |
349 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-backup.hg (glob) |
349 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6d4f22462821-3441f70b-backup.hg (glob) |
350 $ hg log --template "{phase}\n" -r 'rev(9)' |
350 $ hg log --template "{phase}\n" -r 'rev(9)' |
351 secret |
351 secret |
352 |
352 |
353 $ cd .. |
353 $ cd .. |
354 |
354 |
572 $ cd ah5 |
572 $ cd ah5 |
573 $ hg rebase -r '6::' -d 2 |
573 $ hg rebase -r '6::' -d 2 |
574 rebasing 6:3d8a618087a7 "G" |
574 rebasing 6:3d8a618087a7 "G" |
575 rebasing 7:72434a4e60b0 "H" |
575 rebasing 7:72434a4e60b0 "H" |
576 rebasing 8:479ddb54a924 "I" (tip) |
576 rebasing 8:479ddb54a924 "I" (tip) |
577 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
577 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-b4f73f31-backup.hg (glob) |
578 $ hg tglog |
578 $ hg tglog |
579 o 8: 'I' |
579 o 8: 'I' |
580 | |
580 | |
581 o 7: 'H' |
581 o 7: 'H' |
582 | |
582 | |
607 rebasing 4:c01897464e7f "E" |
607 rebasing 4:c01897464e7f "E" |
608 rebasing 5:41bfcc75ed73 "F" |
608 rebasing 5:41bfcc75ed73 "F" |
609 rebasing 6:3d8a618087a7 "G" |
609 rebasing 6:3d8a618087a7 "G" |
610 rebasing 7:72434a4e60b0 "H" |
610 rebasing 7:72434a4e60b0 "H" |
611 rebasing 8:479ddb54a924 "I" (tip) |
611 rebasing 8:479ddb54a924 "I" (tip) |
612 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
612 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-aae93a24-backup.hg (glob) |
613 $ hg tglog |
613 $ hg tglog |
614 o 8: 'I' |
614 o 8: 'I' |
615 | |
615 | |
616 o 7: 'H' |
616 o 7: 'H' |
617 | |
617 | |
676 (actual test) |
676 (actual test) |
677 |
677 |
678 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
678 $ hg rebase --dest 'desc(G)' --rev 'desc(K) + desc(I)' |
679 rebasing 8:e7ec4e813ba6 "I" |
679 rebasing 8:e7ec4e813ba6 "I" |
680 rebasing 10:23a4ace37988 "K" (tip) |
680 rebasing 10:23a4ace37988 "K" (tip) |
681 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-backup.hg (glob) |
681 saved backup bundle to $TESTTMP/a8/.hg/strip-backup/23a4ace37988-b06984b3-backup.hg (glob) |
682 $ hg log --rev 'children(desc(G))' |
682 $ hg log --rev 'children(desc(G))' |
683 changeset: 9:adb617877056 |
683 changeset: 9:adb617877056 |
684 parent: 6:eea13746799a |
684 parent: 6:eea13746799a |
685 user: test |
685 user: test |
686 date: Thu Jan 01 00:00:00 1970 +0000 |
686 date: Thu Jan 01 00:00:00 1970 +0000 |
740 $ hg add subfile |
740 $ hg add subfile |
741 $ hg commit -m 'second source with subdir' |
741 $ hg commit -m 'second source with subdir' |
742 $ hg rebase -b . -d 1 --traceback |
742 $ hg rebase -b . -d 1 --traceback |
743 rebasing 2:779a07b1b7a0 "first source commit" |
743 rebasing 2:779a07b1b7a0 "first source commit" |
744 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
744 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
745 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-backup.hg (glob) |
745 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) |