This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6323

tests: demonstrate that rename is followed to wrong parent from merge
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG618b9ffefa87: tests: demonstrate that rename is followed to wrong parent from merge
Summary

This test case shows another way that copies are handled differently
between hg st (pathcopies()) and hg co -m (mergecopies). The
reason is that pathcopies() calls _tracefiles(), which checks that the
file nodeid of an ancestor matches the file nodeid in the base
commit. mergecopies() should probably be doing the same.

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.

Event Timeline

martinvonz created this revision.Apr 28 2019, 3:00 AM
Closed by commit rHG618b9ffefa87: tests: demonstrate that rename is followed to wrong parent from merge (authored by martinvonz). · Explain WhyApr 28 2019, 4:39 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-commit-amend.t (15 lines)

Diff 14956

tests/test-commit-amend.t

new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/x +++ b/x
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+x +x
$ hg debugrename aaa $ hg debugrename aaa
aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980 aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists
in p1 too, but it was recorded as copied from p2.
$ echo modified >> aaa
BROKEN: should not be follow the rename back to 'aa' here, since the rename
happened compared to p2
$ hg co -m '.^' -t :merge3
merging aaa and aa to aa
warning: conflicts while merging aa! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
$ hg co -C tip
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv aaa aa $ hg mv aaa aa
$ hg ci --amend -m 'merge bar again (undo rename)' $ hg ci --amend -m 'merge bar again (undo rename)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 25:18e3ba160489 changeset: 25:18e3ba160489
tag: tip tag: tip
parent: 22:12594a98ca3f parent: 22:12594a98ca3f
parent: 23:4c94d5bc65f5 parent: 23:4c94d5bc65f5
user: test user: test