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 pull-upgrade +#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull push pull-upgrade push-upgrade ===================================================== Test Copy tracing for chain of copies involving merge @@ -73,7 +73,6 @@ > EOF #endif - #if pull-upgrade $ cat >> $HGRCPATH << EOF > [format] @@ -84,6 +83,16 @@ > EOF #endif +#if push-upgrade + $ cat >> $HGRCPATH << EOF + > [format] + > exp-use-side-data = no + > exp-use-copies-side-data-changeset = no + > [experimental] + > changegroup4 = yes + > EOF +#endif + $ cat > same-content.txt << EOF > Here is some content that will be the same accros multiple file. > @@ -1770,6 +1779,28 @@ $ cd ../repo-chain #endif +#if push-upgrade + $ cat >> $HGRCPATH << EOF + > [format] + > exp-use-side-data = yes + > exp-use-copies-side-data-changeset = yes + > [experimental] + > changegroup4 = yes + > EOF + $ cd .. + $ mv repo-chain repo-source + $ hg init repo-chain + $ cd repo-source + $ hg push ../repo-chain + pushing to ../repo-chain + searching for changes + adding changesets + adding manifests + adding file changes + added 80 changesets with 44 changes to 25 files (+39 heads) + $ cd ../repo-chain +#endif + #if no-compatibility no-filelog no-changeset $ hg debugchangedfiles --compute 0