This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8241

copies-tests: add a case where a file is deleted/added but with a merge
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6f1f4a6f4168: copies-tests: add a case where a file is deleted/added but with a merge
Summary

This is a case similar to DB/BD, 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
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

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

Garbage?

marmoute added inline comments.Mar 6 2020, 1:10 PM
tests/test-copies-chain-merge.t
750

Garbage that went through the crack

martinvonz added inline comments.Mar 6 2020, 1:20 PM
tests/test-copies-chain-merge.t
357

could you make this "g-1: d update" or whatever the convention used elsewhere was?

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

series update after Martin feedback

martinvonz added inline comments.Mar 6 2020, 7:16 PM
tests/test-copies-chain-merge.t
379

I assume this will need to be update too. I can do that in flight.

marmoute added a commit: rHG6f1f4a6f4168: copies-tests: add a case where a file is deleted/added but with a merge.Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6f1f4a6f4168: copies-tests: add a case where a file is deleted/added but with a merge (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 (98 lines)

Diff 20593

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
- one deleting and recreating the file
$ hg up 'desc("i-2")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "some update" >> d
$ hg commit -m "g-1: update d"
martinvonzUnsubmitted
Not Done

could you make this "g-1: d update" or whatever the convention used elsewhere was?

martinvonz: could you make this "g-1: d update" or whatever the convention used elsewhere was?
created new head
$ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mDGm-0 simple merge - one way'
$ hg up 'desc("g-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGDm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
@ 27 mGDm-0 simple merge - the other way]
|\
+---o 26 mDGm-0 simple merge - one way]
| |/
| o 25 g-1]
martinvonzUnsubmitted
Not Done

I assume this will need to be update too. I can do that in flight.

martinvonz: I assume this will need to be update too. I can do that in flight.
| |
o | 14 d-2 re-add d]
| |
o | 13 d-1 delete d]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]
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
01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d
$ hg debugindex d $ hg debugindex d
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
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
6 26 f04cac32d703 b004912a8510 7bded9d9da1f
7 27 d7a5eafb9322 7bded9d9da1f b004912a8510
(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]
:/ :/
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d] o 22 f-2: rename i -> d]
| |
o 21 f-1: rename h -> i] o 21 f-1: rename h -> i]
: :
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
- one deleting and recreating the file
Unlike in the 'BD/DB' cases, an actuall merge happened here. So we should
consider history and rename on both branch of the merge.
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")'
A d
a
R a
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")'
A d
a
R a
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDGm-0")'
M d
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")'
M d
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")'
M d
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")'
M d
$ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way]
|\
| o 25 g-1]
| |
o | 14 d-2 re-add d]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]
$ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way]
|\
| o 25 g-1]
| |
o | 14 d-2 re-add d]
|/
o 2 i-2: c -move-> d]
martinvonzUnsubmitted
Not Done

Garbage?

martinvonz: Garbage?
marmouteAuthorUnsubmitted
Done

Garbage that went through the crack

marmoute: Garbage that went through the crack
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]