Mercurial > hg
comparison tests/test-mv-cp-st-diff.t @ 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 | 57203e0210f8 |
comparison
equal
deleted
inserted
replaced
42211:20fce2742399 | 42212:7bb2f358a13b |
---|---|
1683 debug.copies: time: * seconds (glob) | 1683 debug.copies: time: * seconds (glob) |
1684 A renamed | 1684 A renamed |
1685 f | 1685 f |
1686 R f | 1686 R f |
1687 | 1687 |
1688 Check that merging across the rename works | |
1689 | |
1690 $ echo modified >> renamed | |
1691 BROKEN: This should propagate the change to 'f' | |
1692 $ hg co -m 4 | |
1693 file 'renamed' was deleted in other [destination] but was modified in local [working copy]. | |
1694 What do you want to do? | |
1695 use (c)hanged version, (d)elete, or leave (u)nresolved? u | |
1696 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
1697 use 'hg resolve' to retry unresolved file merges | |
1698 [1] | |
1699 | |
1688 $ cd .. | 1700 $ cd .. |