equal
deleted
inserted
replaced
249 $ hg up -qr 2 |
249 $ hg up -qr 2 |
250 $ hg merge -qr 3 |
250 $ hg merge -qr 3 |
251 $ echo 'other change while merging future "rebase ancestors"' > other |
251 $ echo 'other change while merging future "rebase ancestors"' > other |
252 $ hg ci -Aqm 'merge rebase ancestors' |
252 $ hg ci -Aqm 'merge rebase ancestors' |
253 $ hg rebase -d 5 -v |
253 $ hg rebase -d 5 -v |
254 rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) |
254 rebasing 6:4c5f12f25ebe tip "merge rebase ancestors" |
255 resolving manifests |
255 resolving manifests |
256 removing other |
256 removing other |
257 resolving manifests |
257 resolving manifests |
258 getting other |
258 getting other |
259 committing files: |
259 committing files: |
308 > A Z |
308 > A Z |
309 > |/ |
309 > |/ |
310 > R |
310 > R |
311 > EOS |
311 > EOS |
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" (F tip) |
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 [255] |
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 |
328 > A Z |
328 > A Z |
329 > |/ |
329 > |/ |
330 > R |
330 > R |
331 > EOS |
331 > EOS |
332 $ hg rebase -r B+C+D -d Z |
332 $ hg rebase -r B+C+D -d Z |
333 rebasing 3:c1e6b162678d "B" (B) |
333 rebasing 3:c1e6b162678d B "B" |
334 rebasing 4:d6003a550c2c "C" (C) |
334 rebasing 4:d6003a550c2c C "C" |
335 rebasing 5:c8f78076273e "D" (D tip) |
335 rebasing 5:c8f78076273e D tip "D" |
336 saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg |
336 saved backup bundle to $TESTTMP/dual-merge-base2/.hg/strip-backup/d6003a550c2c-6f1424b6-rebase.hg |
337 $ hg manifest -r 'desc(D)' |
337 $ hg manifest -r 'desc(D)' |
338 B |
338 B |
339 C |
339 C |
340 R |
340 R |
350 > D E |
350 > D E |
351 > | | |
351 > | | |
352 > B C Z |
352 > B C Z |
353 > EOS |
353 > EOS |
354 $ hg rebase -r D+F -d Z |
354 $ hg rebase -r D+F -d Z |
355 rebasing 3:004dc1679908 "D" (D) |
355 rebasing 3:004dc1679908 D "D" |
356 rebasing 5:4be4cbf6f206 "F" (F tip) |
356 rebasing 5:4be4cbf6f206 F tip "F" |
357 saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg |
357 saved backup bundle to $TESTTMP/chosen-merge-base1/.hg/strip-backup/004dc1679908-06a66a3c-rebase.hg |
358 $ hg manifest -r 'desc(F)' |
358 $ hg manifest -r 'desc(F)' |
359 C |
359 C |
360 D |
360 D |
361 E |
361 E |
371 > D E |
371 > D E |
372 > | | |
372 > | | |
373 > B C Z |
373 > B C Z |
374 > EOS |
374 > EOS |
375 $ hg rebase -r E+F -d Z |
375 $ hg rebase -r E+F -d Z |
376 rebasing 4:974e4943c210 "E" (E) |
376 rebasing 4:974e4943c210 E "E" |
377 rebasing 5:4be4cbf6f206 "F" (F tip) |
377 rebasing 5:4be4cbf6f206 F tip "F" |
378 saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg |
378 saved backup bundle to $TESTTMP/chosen-merge-base2/.hg/strip-backup/974e4943c210-b2874da5-rebase.hg |
379 $ hg manifest -r 'desc(F)' |
379 $ hg manifest -r 'desc(F)' |
380 B |
380 B |
381 D |
381 D |
382 E |
382 E |