( )⚙ D10057 test-copies: introduce case combining the `p` and `q` branch

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10057

test-copies: introduce case combining the `p` and `q` branch
ClosedPublic

Authored by marmoute on Feb 22 2021, 9:35 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa1273bea99cc: test-copies: introduce case combining the `p` and `q` branch
rHGf2f7e1844a85: test-copies: introduce case combining the `p` and `q` branch
Summary

That case involves conflicting copies information from each branch. It is
similar to the mAEm / mEAm case except this case actual content merge is
involved too.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Feb 22 2021, 9:35 AM
baymax updated this revision to Diff 25774.Feb 22 2021, 11:34 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHGf2f7e1844a85: test-copies: introduce case combining the `p` and `q` branch.Feb 24 2021, 10:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGf2f7e1844a85: test-copies: introduce case combining the `p` and `q` branch (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 (189 lines)

Diff 25774

tests/test-copies-chain-merge.t

|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: new copy information on both side with an actual merge happening
`````````````````````````````````````````````````````````````````````````
- the "p-" branch renaming 't' to 'v' (through 'u')
- the "q-" branch renaming 'r' to 'v' (through 'w')
$ case_desc="merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content)"
$ hg up 'desc("p-2")'
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg merge 'desc("q-2")' --tool ':union'
merging v
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "mPQm-0 $case_desc - one way"
$ hg up 'desc("q-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("p-2")' --tool ':union'
merging v
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "mQPm-0 $case_desc - the other way"
created new head
$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
o mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way
|\
+---o mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way
| |/
| o e-2 g -move-> f
| |
| o e-1 b -move-> g
| |
o | a-2: e -move-> f
| |
o | a-1: d -move-> e
|/
o i-2: c -move-> d, s -move-> t
|
o i-1: a -move-> c, p -move-> s
|
o i-0 initial commit: a b h
Subcase: existing copy information overwritten on one branch Subcase: existing copy information overwritten on one branch
```````````````````````````````````````````````````````````` ````````````````````````````````````````````````````````````
Merge: Merge:
- one with change to an unrelated file (b) - one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d) - one overwriting a file (d) with a rename (from h to i to d)
$ case_desc="simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)" $ case_desc="simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
$ hg ci -m "mBFm-0 $case_desc - one way" $ hg ci -m "mBFm-0 $case_desc - one way"
$ hg up 'desc("f-2")' $ hg up 'desc("f-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mFBm-0 $case_desc - the other way" $ hg ci -m "mFBm-0 $case_desc - the other way"
created new head created new head
$ hg up null --quiet
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
@ mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way o mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
|\ |\
+---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way +---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
| |/ | |/
| o f-2: rename i -> d | o f-2: rename i -> d
| | | |
| o f-1: rename h -> i | o f-1: rename h -> i
| | | |
o | b-1: b update o | b-1: b update
- one deleting and recreating the file - one deleting and recreating the file
Unlike in the 'BD/DB' cases, an actual merge happened here. So we should Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
consider history and rename on both branch of the merge. consider history and rename on both branch of the merge.
$ case_desc="actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content" $ case_desc="actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content"
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
$ echo "some update" >> d $ echo "some update" >> d
$ hg commit -m "g-1: update d" $ hg commit -m "g-1: update d"
created new head created new head
$ hg up 'desc("d-2")' $ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union $ hg merge 'desc("g-1")' --tool :union
merging d merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge mJ,EA-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
mJ,EAm: chained merges (conflict -> simple) - same content everywhere mJ,EAm: chained merges (conflict -> simple) - same content everywhere
mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge mK,AE-change-m: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
mK,AEm: chained merges (conflict -> simple) - same content everywhere mK,AEm: chained merges (conflict -> simple) - same content everywhere
mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists) mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists) mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
mN,GFm: chained merges (copy-overwrite -> simple) - same content mN,GFm: chained merges (copy-overwrite -> simple) - same content
mO,FGm: chained merges (copy-overwrite -> simple) - same content mO,FGm: chained merges (copy-overwrite -> simple) - same content
mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way
mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way
n-1: unrelated changes (based on the "f" series of changes) n-1: unrelated changes (based on the "f" series of changes)
o-1: unrelated changes (based on "g" changes) o-1: unrelated changes (based on "g" changes)
p-1: t -move-> u p-1: t -move-> u
p-2: u -move-> v p-2: u -move-> v
q-1 r -move-> w q-1 r -move-> w
q-2 w -move-> v q-2 w -move-> v
entry-0014 size 14 entry-0014 size 14
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
merged : f, ; merged : f, ;
##### revision "mEAm-0 merge with copies info on both side - A side" ##### ##### revision "mEAm-0 merge with copies info on both side - A side" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f' '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00f'
merged : f, ; merged : f, ;
##### revision "mPQm-0 merge with copies info on both side - P side" #####
1 sidedata entries
entry-0014 size 14
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v'
merged : v, ;
##### revision "mQPm-0 merge with copies info on both side - P side" #####
1 sidedata entries
entry-0014 size 14
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00v'
merged : v, ;
##### revision "f-1" ##### ##### revision "f-1" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 24 entry-0014 size 24
'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi' '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00hi'
removed : h, ; removed : h, ;
added p1: i, h; added p1: i, h;
##### revision "f-2" ##### ##### revision "f-2" #####
1 sidedata entries 1 sidedata entries
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
o g-1: update d o g-1: update d
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
Subcase: new copy information on both side with an actual merge happening
`````````````````````````````````````````````````````````````````````````
- the "p-" branch renaming 't' to 'v' (through 'u')
- the "q-" branch renaming 'r' to 'v' (through 'w')
$ hg log -G --rev '::(desc("mPQm")+desc("mQPm"))'
o mQPm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - the other way
|\
+---o mPQm-0 merge with copies info on both side - P side: rename t to v, Q side: r to v, (different content) - one way
| |/
| o q-2 w -move-> v
| |
| o q-1 r -move-> w
| |
o | p-2: u -move-> v
| |
o | p-1: t -move-> u
|/
o i-2: c -move-> d, s -move-> t
|
o i-1: a -move-> c, p -move-> s
|
o i-0 initial commit: a b h
#if no-changeset
$ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v'
0946c662ef16e4e67397fd717389eb6693d41749 644 v
$ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v'
0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v
$ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v
$ hg debugindex v | ../no-linkrev
rev linkrev nodeid p1 p2
0 * 3f91841cd75c 000000000000 000000000000
1 * c43c088b811f 000000000000 000000000000
2 * 0946c662ef16 3f91841cd75c c43c088b811f
3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
#else
$ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v'
65fde9f6e4d4da23b3f610e07b53673ea9541d75 644 v
$ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v'
a098dda6413aecf154eefc976afc38b295acb7e5 644 v
$ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
a38b2fa170219750dac9bc7d19df831f213ba708 644 v
$ hg debugindex v | ../no-linkrev
rev linkrev nodeid p1 p2
0 * 5aed6a8dbff0 000000000000 000000000000
1 * a38b2fa17021 000000000000 000000000000
2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
3 * a098dda6413a a38b2fa17021 5aed6a8dbff0
#endif
# Here the filelog based implementation is not looking at the rename
# information (because the file exist on both side). However the changelog
# based on works fine. We have different output.
$ hg status --copies --rev 'desc("p-2")' --rev 'desc("mPQm-0")'
M v
r (no-filelog !)
R r
$ hg status --copies --rev 'desc("p-2")' --rev 'desc("mQPm-0")'
M v
r (no-filelog !)
R r
$ hg status --copies --rev 'desc("q-2")' --rev 'desc("mPQm-0")'
M v
t (no-filelog !)
R t
$ hg status --copies --rev 'desc("q-2")' --rev 'desc("mQPm-0")'
M v
t (no-filelog !)
R t
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("p-2")'
A v
t
R t
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("q-2")'
A v
r
R r
# From here, we run status against revision where both source file exists.
#
# The filelog based implementation picks an arbitrary side based on revision
# numbers. So the same side "wins" whatever the parents order is. This is
# sub-optimal because depending on revision numbers means the result can be
# different from one repository to the next.
#
# The changeset based algorithm use the parent order to break tie on conflicting
# information and will have a different order depending on who is p1 and p2.
# That order is stable accross repositories. (data from p1 prevails)
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mPQm-0")'
A v
t
R r
R t
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mQPm-0")'
A v
t (filelog !)
r (no-filelog !)
R r
R t
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mPQm-0")'
A d
a
A v
r (filelog !)
p (no-filelog !)
R a
R p
R r
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm-0")'
A d
a
A v
r
R a
R p
R r
Comparing with merging with a deletion (and keeping the file) Comparing with merging with a deletion (and keeping the file)
------------------------------------------------------------- -------------------------------------------------------------
Merge: Merge:
- one removing a file (d) - one removing a file (d)
- one updating that file - one updating that file
- the merge keep the modified version of the file (canceling the delete) - the merge keep the modified version of the file (canceling the delete)