615 crosschecking files in changesets and manifests |
615 crosschecking files in changesets and manifests |
616 checking files |
616 checking files |
617 10 files, 10 changesets, 28 total revisions |
617 10 files, 10 changesets, 28 total revisions |
618 searching 1 changesets for largefiles |
618 searching 1 changesets for largefiles |
619 verified existence of 3 revisions of 3 largefiles |
619 verified existence of 3 revisions of 3 largefiles |
|
620 |
|
621 Test that merging does not revert to old versions of largefiles (this has |
|
622 also been very problematic). |
|
623 |
|
624 $ cd .. |
|
625 $ hg clone -r 7 e f |
|
626 adding changesets |
|
627 adding manifests |
|
628 adding file changes |
|
629 added 8 changesets with 24 changes to 10 files |
|
630 updating to branch default |
|
631 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
632 getting changed largefiles |
|
633 3 largefiles updated, 0 removed |
|
634 $ cd f |
|
635 $ echo "large4-merge-test" > sub/large4 |
|
636 $ hg commit -m "Modify large4 to test merge" |
|
637 $ hg pull ../e |
|
638 pulling from ../e |
|
639 searching for changes |
|
640 adding changesets |
|
641 adding manifests |
|
642 adding file changes |
|
643 added 2 changesets with 4 changes to 4 files (+1 heads) |
|
644 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
645 $ hg merge |
|
646 merging sub/large4 |
|
647 largefile sub/large4 has a merge conflict |
|
648 keep (l)ocal or take (o)ther? l |
|
649 3 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
650 (branch merge, don't forget to commit) |
|
651 getting changed largefiles |
|
652 1 largefiles updated, 0 removed |
|
653 $ hg commit -m "Merge repos e and f" |
|
654 $ cat normal3 |
|
655 normal3-modified |
|
656 $ cat sub/normal4 |
|
657 normal4-modified |
|
658 $ cat sub/large4 |
|
659 large4-merge-test |
|
660 $ cat sub2/large6 |
|
661 large6-modified |
|
662 $ cat sub2/large7 |
|
663 large7 |