Patchwork D10347: test-copies: test that copies' sidedata does not get corrupted during pull

login
register
mail settings
Submitter phabricator
Date April 9, 2021, 8:51 a.m.
Message ID <differential-rev-PHID-DREV-77qhkcfdhelewdwdejvz-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48663/
State Superseded
Headers show

Comments

phabricator - April 9, 2021, 8:51 a.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is an important usecase.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10347

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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
+#testcases filelog compatibility changeset sidedata upgraded upgraded-parallel pull
 
 =====================================================
 Test Copy tracing for chain of copies involving merge
@@ -57,6 +57,14 @@ 
   > EOF
 #endif
 
+#if pull
+  $ cat >> $HGRCPATH << EOF
+  > [format]
+  > exp-use-side-data = yes
+  > exp-use-copies-side-data-changeset = yes
+  > EOF
+#endif
+
 
   $ cat > same-content.txt << EOF
   > Here is some content that will be the same accros multiple file.
@@ -1688,6 +1696,21 @@ 
   
 #endif
 
+#if pull
+  $ 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 no-compatibility no-filelog no-changeset