D6322: test: demonstrate failure to follow rename with shadowed linkrev

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Sun Apr 28 03:00:31 EDT 2019


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This shows a difference in handling of copies between `hg st`
  (pathcopies()) and `hg co -m`. The issue here is that mergecopies()
  uses the unadjusted linkrev() for determining when to stop walking
  ancestors.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-mv-cp-st-diff.t

CHANGE DETAILS

diff --git a/tests/test-mv-cp-st-diff.t b/tests/test-mv-cp-st-diff.t
--- a/tests/test-mv-cp-st-diff.t
+++ b/tests/test-mv-cp-st-diff.t
@@ -1685,4 +1685,16 @@
     f
   R f
 
+Check that merging across the rename works
+
+  $ echo modified >> renamed
+BROKEN: This should propagate the change to 'f'
+  $ hg co -m 4
+  file 'renamed' was deleted in other [destination] but was modified in local [working copy].
+  What do you want to do?
+  use (c)hanged version, (d)elete, or leave (u)nresolved? u
+  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
+
   $ cd ..



To: martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list