This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6322

test: demonstrate failure to follow rename with shadowed linkrev
ClosedPublic

Authored by martinvonz on Apr 28 2019, 3:00 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7bb2f358a13b: test: demonstrate failure to follow rename with shadowed linkrev
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-mv-cp-st-diff.t (12 lines)

Diff 14955

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

debug.copies: missing files to search: 1 debug.copies: missing files to search: 1
debug.copies: tracing file: renamed debug.copies: tracing file: renamed
debug.copies: rename of: f debug.copies: rename of: f
debug.copies: time: * seconds (glob) debug.copies: time: * seconds (glob)
A renamed A renamed
f f
R 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 .. $ cd ..