This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8652

tests: test more cases where a file got replaced by a copy
ClosedPublic

Authored by martinvonz on Jun 23 2020, 1:03 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG4b79e92a5ef8: tests: test more cases where a file got replaced by a copy
Summary

This adds a test where a file is modified on one branch and is renamed
onto another file in another branch. That should ideally be
automatically resolved (by propagating the modification to the rename
destination). Alternatively, it could be considered a modify/delete
conflict. It should at least not be automatically resolved by ignoring
the modification. However, that is what actually happens with the
changeset-centric algorithm since I broke it in b4057d001760 (merge:
when rename was made on both sides, use ancestor as merge base,
2020-01-22). Before that commit, it resulted in a modify/delete
conflict. The filelog-centric algorithm was broken already before that
commit.

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-copies.t (67 lines)

Diff 23411

tests/test-copies.t

y -> z (no-filelog !) y -> z (no-filelog !)
$ hg debugpathcopies 1 5 $ hg debugpathcopies 1 5
y -> z (no-filelog !) y -> z (no-filelog !)
$ hg debugpathcopies 2 5 $ hg debugpathcopies 2 5
x -> z (no-filelog !) x -> z (no-filelog !)
$ hg debugpathcopies 0 5 $ hg debugpathcopies 0 5
x -> z x -> z
Create x and y, then remove y and rename x to y on one side of merge, and
modify x on the other side. The modification to x from the second side
should be propagated to y.
$ newrepo
$ echo original > x
$ hg add x
$ echo unrelated > y
$ hg add y
$ hg commit -m 'add x and y'
$ hg remove y
$ hg commit -m 'remove y'
$ hg rename x y
$ hg commit -m 'rename x to y'
$ hg checkout -q 0
$ echo modified > x
$ hg commit -m 'modify x'
created new head
$ hg l
@ 3 modify x
| x
| o 2 rename x to y
| | x y
| o 1 remove y
|/ y
o 0 add x and y
x y
#if filelog
$ hg merge 2
file 'x' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
BROKEN: should be "modified"
$ cat y
original
#else
$ hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
BROKEN: should be "modified"
$ cat y
original
#endif
Same as above, but in the opposite direction
#if filelog
$ hg co -qC 2
$ hg merge 3
file 'x' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
BROKEN: should be "modified"
$ cat y
original
#else
$ hg co -qC 2
$ hg merge 3
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
BROKEN: should be "modified"
$ cat y
original
#endif
Create x and y, then rename x to z on one side of merge, and rename y to z and Create x and y, then rename x to z on one side of merge, and rename y to z and
then delete z on the other side. then delete z on the other side.
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ hg ci -Aqm 'add x and y' $ hg ci -Aqm 'add x and y'
$ hg mv x z $ hg mv x z