Show More
@@ -1,4 +1,4 b'' | |||||
1 | #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel |
|
1 | #testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull | |
2 |
|
2 | |||
3 | ===================================================== |
|
3 | ===================================================== | |
4 | Test Copy tracing for chain of copies involving merge |
|
4 | Test Copy tracing for chain of copies involving merge | |
@@ -57,6 +57,14 b' use git diff to see rename' | |||||
57 | > EOF |
|
57 | > EOF | |
58 | #endif |
|
58 | #endif | |
59 |
|
59 | |||
|
60 | #if pull | |||
|
61 | $ cat >> $HGRCPATH << EOF | |||
|
62 | > [format] | |||
|
63 | > exp-use-side-data = yes | |||
|
64 | > exp-use-copies-side-data-changeset = yes | |||
|
65 | > EOF | |||
|
66 | #endif | |||
|
67 | ||||
60 |
|
68 | |||
61 | $ cat > same-content.txt << EOF |
|
69 | $ cat > same-content.txt << EOF | |
62 | > Here is some content that will be the same accros multiple file. |
|
70 | > Here is some content that will be the same accros multiple file. | |
@@ -1690,6 +1698,21 b' We upgrade a repository that is not usin' | |||||
1690 |
|
1698 | |||
1691 | #endif |
|
1699 | #endif | |
1692 |
|
1700 | |||
|
1701 | #if pull | |||
|
1702 | $ cd .. | |||
|
1703 | $ mv repo-chain repo-source | |||
|
1704 | $ hg init repo-chain | |||
|
1705 | $ cd repo-chain | |||
|
1706 | $ hg pull ../repo-source | |||
|
1707 | pulling from ../repo-source | |||
|
1708 | requesting all changes | |||
|
1709 | adding changesets | |||
|
1710 | adding manifests | |||
|
1711 | adding file changes | |||
|
1712 | added 80 changesets with 44 changes to 25 files (+39 heads) | |||
|
1713 | new changesets a3a31bbefea6:908ce9259ffa | |||
|
1714 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
1715 | #endif | |||
1693 |
|
1716 | |||
1694 | #if no-compatibility no-filelog no-changeset |
|
1717 | #if no-compatibility no-filelog no-changeset | |
1695 |
|
1718 |
General Comments 0
You need to be logged in to leave comments.
Login now