Alphare created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY If the source does not have the data, the pulling client should compute the necessary side-data while pulling. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10349 AFFECTED FILES tests/test-copies-chain-merge.t CHANGE DETAILS diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -1,4 +1,4 @@ -#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push +#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push pull-upgrade ===================================================== Test Copy tracing for chain of copies involving merge @@ -74,6 +74,14 @@ #endif +#if pull-upgrade + $ cat >> $HGRCPATH << EOF + > [format] + > exp-use-side-data = no + > exp-use-copies-side-data-changeset = no + > EOF +#endif + $ cat > same-content.txt << EOF > Here is some content that will be the same accros multiple file. > @@ -1720,6 +1728,27 @@ (run 'hg heads' to see heads, 'hg merge' to merge) #endif +#if pull-upgrade + $ cat >> $HGRCPATH << EOF + > [format] + > exp-use-side-data = yes + > exp-use-copies-side-data-changeset = yes + > EOF + $ cd .. + $ mv repo-chain repo-source + $ hg init repo-chain + $ cd repo-chain + $ hg pull ../repo-source + pulling from ../repo-source + requesting all changes + adding changesets + adding manifests + adding file changes + added 80 changesets with 44 changes to 25 files (+39 heads) + new changesets a3a31bbefea6:908ce9259ffa + (run 'hg heads' to see heads, 'hg merge' to merge) +#endif + #if push $ cd .. $ mv repo-chain repo-source To: Alphare, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
