equal
deleted
inserted
replaced
397 o 0:cb9a public a |
397 o 0:cb9a public a |
398 |
398 |
399 $ hg rebase -s 1 -d 2 |
399 $ hg rebase -s 1 -d 2 |
400 rebasing 1:d2ae7f538514 "b" |
400 rebasing 1:d2ae7f538514 "b" |
401 saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg (glob) |
401 saved backup bundle to $TESTTMP/issue5678/.hg/strip-backup/d2ae7f538514-2953539b-rebase.hg (glob) |
402 BROKEN: d36c should remain public |
|
403 $ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n' |
402 $ hg log -G -T '{rev}:{node|shortest} {phase} {desc}\n' |
404 o 2:c882 draft b |
403 o 2:c882 draft b |
405 | |
404 | |
406 @ 1:d36c draft c |
405 @ 1:d36c public c |
407 | |
406 | |
408 o 0:cb9a public a |
407 o 0:cb9a public a |
409 |
408 |
410 $ cd .. |
409 $ cd .. |
411 |
410 |