equal
deleted
inserted
replaced
100 continue: hg rebase --continue |
100 continue: hg rebase --continue |
101 $ hg rebase --continue |
101 $ hg rebase --continue |
102 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
102 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
103 rebasing 4:46f0b057b5c0 "L2" |
103 rebasing 4:46f0b057b5c0 "L2" |
104 rebasing 5:8029388f38dc "L3" (mybook) |
104 rebasing 5:8029388f38dc "L3" (mybook) |
105 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob) |
105 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg |
106 |
106 |
107 $ hg tglog |
107 $ hg tglog |
108 @ 5:secret 'L3' mybook |
108 @ 5:secret 'L3' mybook |
109 | |
109 | |
110 o 4:secret 'L2' |
110 o 4:secret 'L2' |
298 e31216eec445e44352c5f01588856059466a24c9 |
298 e31216eec445e44352c5f01588856059466a24c9 |
299 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
299 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
300 bundle2-output-bundle: "HG20", (1 params) 2 parts total |
300 bundle2-output-bundle: "HG20", (1 params) 2 parts total |
301 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
301 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
302 bundle2-output-part: "phase-heads" 24 bytes payload |
302 bundle2-output-part: "phase-heads" 24 bytes payload |
303 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg (glob) |
303 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg |
304 3 changesets found |
304 3 changesets found |
305 list of changesets: |
305 list of changesets: |
306 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
306 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
307 19c888675e133ab5dff84516926a65672eaf04d9 |
307 19c888675e133ab5dff84516926a65672eaf04d9 |
308 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
308 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
411 continue: hg rebase --continue |
411 continue: hg rebase --continue |
412 $ hg rebase --continue --config experimental.evolution=none |
412 $ hg rebase --continue --config experimental.evolution=none |
413 rebasing 1:112478962961 "B" (B) |
413 rebasing 1:112478962961 "B" (B) |
414 rebasing 3:f585351a92f8 "D" (D) |
414 rebasing 3:f585351a92f8 "D" (D) |
415 warning: orphaned descendants detected, not stripping 112478962961 |
415 warning: orphaned descendants detected, not stripping 112478962961 |
416 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) |
416 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg |
417 |
417 |
418 $ rm .hg/localtags |
418 $ rm .hg/localtags |
419 $ hg tglog |
419 $ hg tglog |
420 o 5:draft 'D' |
420 o 5:draft 'D' |
421 | |
421 | |