equal
deleted
inserted
replaced
56 $ hg continue --dry-run |
56 $ hg continue --dry-run |
57 rebase in progress, will be resumed |
57 rebase in progress, will be resumed |
58 #endif |
58 #endif |
59 |
59 |
60 $ hg continue |
60 $ hg continue |
61 rebasing 4:c1e6b162678d "B" (B) |
61 rebasing 4:c1e6b162678d B "B" |
62 rebasing 8:6f7a236de685 "D" (D) |
62 rebasing 8:6f7a236de685 D "D" |
63 rebasing 2:de008c61a447 "E" (E) |
63 rebasing 2:de008c61a447 E "E" |
64 rebasing 7:d2fa1c02b240 "G" (G) |
64 rebasing 7:d2fa1c02b240 G "G" |
65 rebasing 9:6582e6951a9c "H" (H tip) |
65 rebasing 9:6582e6951a9c H tip "H" |
66 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
66 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
67 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg |
67 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg |
68 |
68 |
69 $ hg log -G -T '{rev}:{node|short} {desc}\n' |
69 $ hg log -G -T '{rev}:{node|short} {desc}\n' |
70 o 11:721b8da0a708 H |
70 o 11:721b8da0a708 H |