equal
deleted
inserted
replaced
249 [1] |
249 [1] |
250 |
250 |
251 C onto A - rebase onto an ancestor: |
251 C onto A - rebase onto an ancestor: |
252 |
252 |
253 $ hg rebase -d 0 -s 2 |
253 $ hg rebase -d 0 -s 2 |
254 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg |
254 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
255 $ hg tglog |
255 $ hg tglog |
256 @ 7: 'D' |
256 @ 7: 'D' |
257 | |
257 | |
258 o 6: 'C' |
258 o 6: 'C' |
259 | |
259 | |
471 rebase on ancestor with revset |
471 rebase on ancestor with revset |
472 |
472 |
473 $ hg clone -q -u . ah ah5 |
473 $ hg clone -q -u . ah ah5 |
474 $ cd ah5 |
474 $ cd ah5 |
475 $ hg rebase -r '6::' -d 2 |
475 $ hg rebase -r '6::' -d 2 |
476 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg |
476 saved backup bundle to $TESTTMP/ah5/.hg/strip-backup/3d8a618087a7-backup.hg (glob) |
477 $ hg tglog |
477 $ hg tglog |
478 @ 8: 'I' |
478 @ 8: 'I' |
479 | |
479 | |
480 o 7: 'H' |
480 o 7: 'H' |
481 | |
481 | |