equal
deleted
inserted
replaced
519 |
519 |
520 #excluded 'whole rebase set is extinct and ignored.' message not in core |
520 #excluded 'whole rebase set is extinct and ignored.' message not in core |
521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 |
521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 |
522 rebasing 3:0d3f46688ccc "add obsol_c" |
522 rebasing 3:0d3f46688ccc "add obsol_c" |
523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) |
523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) |
524 2 new divergent changesets |
524 2 new contentdivergent changesets |
525 $ hg --hidden log -q -r 'successors(3)' |
525 $ hg --hidden log -q -r 'successors(3)' |
526 4:725c380fe99b |
526 4:725c380fe99b |
527 10:2033b4e49474 |
527 10:2033b4e49474 |
528 $ hg up tip |
528 $ hg up tip |
529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
529 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |