equal
deleted
inserted
replaced
50 |
50 |
51 $ hg rebase -s 3 -d 7 |
51 $ hg rebase -s 3 -d 7 |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
53 |
53 |
54 $ hg tglog |
54 $ hg tglog |
55 @ 7: 'D' |
55 o 7: 'D' |
56 | |
56 | |
57 o 6: 'H' |
57 @ 6: 'H' |
58 | |
58 | |
59 | o 5: 'G' |
59 | o 5: 'G' |
60 |/| |
60 |/| |
61 o | 4: 'F' |
61 o | 4: 'F' |
62 | | |
62 | | |
78 |
78 |
79 $ hg rebase -s 3 -d 5 |
79 $ hg rebase -s 3 -d 5 |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
80 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
81 |
81 |
82 $ hg tglog |
82 $ hg tglog |
83 @ 7: 'D' |
83 o 7: 'D' |
84 | |
84 | |
85 | o 6: 'H' |
85 | @ 6: 'H' |
86 |/ |
86 |/ |
87 | o 5: 'G' |
87 | o 5: 'G' |
88 |/| |
88 |/| |
89 o | 4: 'F' |
89 o | 4: 'F' |
90 | | |
90 | | |
106 |
106 |
107 $ hg rebase -s 4 -d 7 |
107 $ hg rebase -s 4 -d 7 |
108 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
108 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
109 |
109 |
110 $ hg tglog |
110 $ hg tglog |
111 @ 6: 'E' |
111 o 6: 'E' |
112 | |
112 | |
113 o 5: 'H' |
113 @ 5: 'H' |
114 | |
114 | |
115 o 4: 'F' |
115 o 4: 'F' |
116 | |
116 | |
117 | o 3: 'D' |
117 | o 3: 'D' |
118 | | |
118 | | |
158 |
158 |
159 $ hg rebase -s 6 -d 7 |
159 $ hg rebase -s 6 -d 7 |
160 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
160 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
161 |
161 |
162 $ hg tglog |
162 $ hg tglog |
163 @ 7: 'G' |
163 o 7: 'G' |
164 |\ |
164 |\ |
165 | o 6: 'H' |
165 | @ 6: 'H' |
166 | | |
166 | | |
167 | o 5: 'F' |
167 | o 5: 'F' |
168 | | |
168 | | |
169 o | 4: 'E' |
169 o | 4: 'E' |
170 |/ |
170 |/ |
254 C onto A - rebase onto an ancestor: |
254 C onto A - rebase onto an ancestor: |
255 |
255 |
256 $ hg rebase -d 0 -s 2 |
256 $ hg rebase -d 0 -s 2 |
257 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
257 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
258 $ hg tglog |
258 $ hg tglog |
259 @ 7: 'D' |
259 o 7: 'D' |
260 | |
260 | |
261 o 6: 'C' |
261 o 6: 'C' |
262 | |
262 | |
263 | o 5: 'H' |
263 | @ 5: 'H' |
264 | | |
264 | | |
265 | | o 4: 'G' |
265 | | o 4: 'G' |
266 | |/| |
266 | |/| |
267 | o | 3: 'F' |
267 | o | 3: 'F' |
268 |/ / |
268 |/ / |
358 abort: can't remove original changesets with unrebased descendants |
358 abort: can't remove original changesets with unrebased descendants |
359 (use --keep to keep original changesets) |
359 (use --keep to keep original changesets) |
360 [255] |
360 [255] |
361 $ hg rebase -r '2::8' -d 1 --keep |
361 $ hg rebase -r '2::8' -d 1 --keep |
362 $ hg tglog |
362 $ hg tglog |
363 @ 13: 'I' |
363 o 13: 'I' |
364 | |
364 | |
365 o 12: 'H' |
365 o 12: 'H' |
366 | |
366 | |
367 o 11: 'G' |
367 o 11: 'G' |
368 | |
368 | |
399 abort: can't remove original changesets with unrebased descendants |
399 abort: can't remove original changesets with unrebased descendants |
400 (use --keep to keep original changesets) |
400 (use --keep to keep original changesets) |
401 [255] |
401 [255] |
402 $ hg rebase -r '3::8' -d 1 --keep |
402 $ hg rebase -r '3::8' -d 1 --keep |
403 $ hg tglog |
403 $ hg tglog |
404 @ 12: 'I' |
404 o 12: 'I' |
405 | |
405 | |
406 o 11: 'H' |
406 o 11: 'H' |
407 | |
407 | |
408 o 10: 'G' |
408 o 10: 'G' |
409 | |
409 | |
438 abort: can't remove original changesets with unrebased descendants |
438 abort: can't remove original changesets with unrebased descendants |
439 (use --keep to keep original changesets) |
439 (use --keep to keep original changesets) |
440 [255] |
440 [255] |
441 $ hg rebase -r '3::7' -d 1 --keep |
441 $ hg rebase -r '3::7' -d 1 --keep |
442 $ hg tglog |
442 $ hg tglog |
443 @ 11: 'H' |
443 o 11: 'H' |
444 | |
444 | |
445 o 10: 'G' |
445 o 10: 'G' |
446 | |
446 | |
447 o 9: 'D' |
447 o 9: 'D' |
448 | |
448 | |
475 abort: can't remove original changesets with unrebased descendants |
475 abort: can't remove original changesets with unrebased descendants |
476 (use --keep to keep original changesets) |
476 (use --keep to keep original changesets) |
477 [255] |
477 [255] |
478 $ hg rebase -r '3::(7+5)' -d 1 --keep |
478 $ hg rebase -r '3::(7+5)' -d 1 --keep |
479 $ hg tglog |
479 $ hg tglog |
480 @ 13: 'H' |
480 o 13: 'H' |
481 | |
481 | |
482 o 12: 'G' |
482 o 12: 'G' |
483 | |
483 | |
484 | o 11: 'F' |
484 | o 11: 'F' |
485 | | |
485 | | |
515 $ hg clone -q -u . ah ah5 |
515 $ hg clone -q -u . ah ah5 |
516 $ cd ah5 |
516 $ cd ah5 |
517 $ hg rebase -r '6::' -d 2 |
517 $ hg rebase -r '6::' -d 2 |
518 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
518 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
519 $ hg tglog |
519 $ hg tglog |
520 @ 8: 'I' |
520 o 8: 'I' |
521 | |
521 | |
522 o 7: 'H' |
522 o 7: 'H' |
523 | |
523 | |
524 o 6: 'G' |
524 o 6: 'G' |
525 | |
525 | |
545 $ hg clone -q -u . ah ah6 |
545 $ hg clone -q -u . ah ah6 |
546 $ cd ah6 |
546 $ cd ah6 |
547 $ hg rebase -r '(4+6)::' -d 1 |
547 $ hg rebase -r '(4+6)::' -d 1 |
548 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
548 saved backup bundle to $TESTTMP/ah6/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
549 $ hg tglog |
549 $ hg tglog |
550 @ 8: 'I' |
550 o 8: 'I' |
551 | |
551 | |
552 o 7: 'H' |
552 o 7: 'H' |
553 | |
553 | |
554 o 6: 'G' |
554 o 6: 'G' |
555 | |
555 | |