equal
deleted
inserted
replaced
438 Test that the internal linear merging works correctly |
438 Test that the internal linear merging works correctly |
439 (both heads are stripped to keep pairing of revision number and commit log) |
439 (both heads are stripped to keep pairing of revision number and commit log) |
440 |
440 |
441 $ hg update -q -C 2 |
441 $ hg update -q -C 2 |
442 $ hg strip 3 4 |
442 $ hg strip 3 4 |
443 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg (glob) |
443 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/9530e27857f7-2e7b195d-backup.hg |
444 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP |
444 $ mv .hg/strip-backup/9530e27857f7-2e7b195d-backup.hg $TESTTMP |
445 |
445 |
446 (internal linear merging at "hg pull --update") |
446 (internal linear merging at "hg pull --update") |
447 |
447 |
448 $ echo 'large1 for linear merge (conflict)' > large1 |
448 $ echo 'large1 for linear merge (conflict)' > large1 |
449 $ echo 'large2 for linear merge (conflict with normal file)' > large2 |
449 $ echo 'large2 for linear merge (conflict with normal file)' > large2 |
450 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
450 $ hg pull --update --config debug.dirstate.delaywrite=2 $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
451 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg (glob) |
451 pulling from $TESTTMP/9530e27857f7-2e7b195d-backup.hg |
452 searching for changes |
452 searching for changes |
453 adding changesets |
453 adding changesets |
454 adding manifests |
454 adding manifests |
455 adding file changes |
455 adding file changes |
456 added 3 changesets with 5 changes to 5 files |
456 added 3 changesets with 5 changes to 5 files |