This revision was automatically updated to reflect the committed changes. Closed by commit rHG7bb2f358a13b: test: demonstrate failure to follow rename with shadowed linkrev (authored by martinvonz, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6322?vs=14941&id=14955 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 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel