This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8242

copies-tests: add a case where with merge with an overwritten files
ClosedPublic

Authored by marmoute on Mar 5 2020, 1:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc8fd21413458: copies-tests: add a case where with merge with an overwritten files
Summary

This is similar to the BF/FB case, but in this case, the other branch updated
the file. So an actual merge happens and the two "independant" file history has
to be merged.

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

marmoute created this revision.Mar 5 2020, 1:14 PM
marmoute updated this revision to Diff 20549.Mar 6 2020, 5:21 AM
martinvonz added a subscriber: martinvonz.Mar 6 2020, 1:25 PM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
412

one of them should be "mFGm"

413

just out of curiosity, what does the trailing "]" you put in the template indicate?

marmoute added inline comments.Mar 6 2020, 4:50 PM
tests/test-copies-chain-merge.t
412

right, good spot. Thanks

413

This is probably a typo. We can clean it up afterward.

martinvonz added inline comments.Mar 6 2020, 4:51 PM
tests/test-copies-chain-merge.t
413

Sure. Could you include that fix in the series? I've seen too many "we can clean it up afterward" be forgotten.

marmoute updated this revision to Diff 20594.Mar 6 2020, 6:52 PM

series update after Martin feedback

marmoute added a commit: rHGc8fd21413458: copies-tests: add a case where with merge with an overwritten files.Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc8fd21413458: copies-tests: add a case where with merge with an overwritten files (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (114 lines)

Diff 20605

tests/test-copies-chain-merge.t

o 2 i-2: c -move-> d] o 2 i-2: c -move-> d]
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c]
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h]
Merge:
- one with change to a file (d)
- one overwriting that file with a rename (from h to i, to d)
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mFGm-0 simple merge - one way'
created new head
$ hg up 'desc("g-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' --tool :union
merging d
0 files updated, 1 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGFm-0 simple merge - the other way'
created new head
martinvonzUnsubmitted
Not Done

one of them should be "mFGm"

martinvonz: one of them should be "mFGm"
marmouteAuthorUnsubmitted
Done

right, good spot. Thanks

marmoute: right, good spot. Thanks
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
martinvonzUnsubmitted
Not Done

just out of curiosity, what does the trailing "]" you put in the template indicate?

martinvonz: just out of curiosity, what does the trailing "]" you put in the template indicate?
marmouteAuthorUnsubmitted
Done

This is probably a typo. We can clean it up afterward.

marmoute: This is probably a typo. We can clean it up afterward.
martinvonzUnsubmitted
Not Done

Sure. Could you include that fix in the series? I've seen too many "we can clean it up afterward" be forgotten.

martinvonz: Sure. Could you include that fix in the series? I've seen too many "we can clean it up…
@ 29 mGFm-0 simple merge - the other way]
|\
+---o 28 mFGm-0 simple merge - one way]
| |/
| o 25 g-1: update d]
| |
o | 22 f-2: rename i -> d]
| |
o | 21 f-1: rename h -> i]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b h]
Check results Check results
============= =============
merging with unrelated change does not interfer wit the renames merging with unrelated change does not interfer wit the renames
--------------------------------------------------------------- ---------------------------------------------------------------
- rename on one side - rename on one side
- unrelated change on the other side - unrelated change on the other side
0 2 01c2f5eabdc4 000000000000 000000000000 0 2 01c2f5eabdc4 000000000000 000000000000
1 10 b004912a8510 000000000000 000000000000 1 10 b004912a8510 000000000000 000000000000
2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
3 22 c72365ee036f 000000000000 000000000000 3 22 c72365ee036f 000000000000 000000000000
4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f 4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f
5 25 7bded9d9da1f 01c2f5eabdc4 000000000000 5 25 7bded9d9da1f 01c2f5eabdc4 000000000000
6 26 f04cac32d703 b004912a8510 7bded9d9da1f 6 26 f04cac32d703 b004912a8510 7bded9d9da1f
7 27 d7a5eafb9322 7bded9d9da1f b004912a8510 7 27 d7a5eafb9322 7bded9d9da1f b004912a8510
8 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f
(This `hg log` output if wrong, since no merge actually happened). (This `hg log` output if wrong, since no merge actually happened).
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 15 mBDm-0 simple merge - one way] o 15 mBDm-0 simple merge - one way]
|\ |\
o : 14 d-2 re-add d] o : 14 d-2 re-add d]
:/ :/
o | 14 d-2 re-add d] o | 14 d-2 re-add d]
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d]
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c]
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h]
Merge:
- one with change to a file (d)
- one overwriting that file with a rename (from h to i, to d)
This case is similar to BF/FB, but an actual merge happens, so both side of the
history are relevant.
Note:
| In this case, the merge get conflicting information since on one side we have
| "a -> c -> d". and one the other one we have "h -> i -> d".
|
| The current code arbitrarily pick one side
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")'
A d
a
R a
R h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")'
A d
a
R a
R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")'
M d
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")'
M d
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFGm-0")'
M d
R i
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mGFm-0")'
M d
R i
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mFGm-0")'
M d
R h
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")'
M d
R h
$ hg log -Gfr 'desc("mFGm-0")' d
o 28 mFGm-0 simple merge - one way]
|\
| o 25 g-1: update d]
| |
o | 22 f-2: rename i -> d]
| |
o | 21 f-1: rename h -> i]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b h]
$ hg log -Gfr 'desc("mGFm-0")' d
@ 29 mGFm-0 simple merge - the other way]
|\
| o 25 g-1: update d]
| |
o | 22 f-2: rename i -> d]
| |
o | 21 f-1: rename h -> i]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b h]