equal
deleted
inserted
replaced
152 > c |
152 > c |
153 > EOF |
153 > EOF |
154 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
154 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
155 rebasing 4:4b019212aaf6 "dev: merge default" |
155 rebasing 4:4b019212aaf6 "dev: merge default" |
156 abort: rebasing 4:4b019212aaf6 will include unwanted changes from 1:1d1a643d390e |
156 abort: rebasing 4:4b019212aaf6 will include unwanted changes from 1:1d1a643d390e |
157 [255] |
157 [10] |
158 $ cd .. |
158 $ cd .. |
159 |
159 |
160 |
160 |
161 Test order of parents of rebased merged with un-rebased changes as p1. |
161 Test order of parents of rebased merged with un-rebased changes as p1. |
162 |
162 |
312 $ hg rebase -r D+E+F -d Z |
312 $ hg rebase -r D+E+F -d Z |
313 rebasing 5:5f2c926dfecf D "D" |
313 rebasing 5:5f2c926dfecf D "D" |
314 rebasing 6:b296604d9846 E "E" |
314 rebasing 6:b296604d9846 E "E" |
315 rebasing 7:caa9781e507d F tip "F" |
315 rebasing 7:caa9781e507d F tip "F" |
316 abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d |
316 abort: rebasing 7:caa9781e507d will include unwanted changes from 4:d6003a550c2c or 3:c1e6b162678d |
317 [255] |
317 [10] |
318 |
318 |
319 The warning does not get printed if there is no unwanted change detected: |
319 The warning does not get printed if there is no unwanted change detected: |
320 |
320 |
321 $ hg init $TESTTMP/dual-merge-base2 |
321 $ hg init $TESTTMP/dual-merge-base2 |
322 $ cd $TESTTMP/dual-merge-base2 |
322 $ cd $TESTTMP/dual-merge-base2 |