Mercurial > hg
changeset 42212:7bb2f358a13b
test: demonstrate failure to follow rename with shadowed linkrev
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.
Differential Revision: https://phab.mercurial-scm.org/D6322
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sat, 27 Apr 2019 23:14:49 -0700 |
| parents | 20fce2742399 |
| children | 618b9ffefa87 |
| files | tests/test-mv-cp-st-diff.t |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mv-cp-st-diff.t Sat Apr 27 22:57:15 2019 -0700 +++ b/tests/test-mv-cp-st-diff.t Sat Apr 27 23:14:49 2019 -0700 @@ -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 ..