( )⚙ D10088 test-copies: add a test updating file content while salvaging it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10088

test-copies: add a test updating file content while salvaging it
ClosedPublic

Authored by marmoute on Mar 2 2021, 3:14 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG316a768f2e43: test-copies: add a test updating file content while salvaging it
Summary

A deleted file is brought back during a merge. Its content is changed in the
same go.

This reveal some issue with the upgrade code.

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 2 2021, 3:14 AM
marmoute planned changes to this revision.Mar 2 2021, 3:15 AM

(this will need a rebase over D10084 which is more important)

baymax updated this revision to Diff 26023.Mar 2 2021, 11:59 AM

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

pulkit accepted this revision.Mar 17 2021, 6:12 AM
This revision is now accepted and ready to land.Mar 17 2021, 6:12 AM
pulkit updated this revision to Diff 26518.Mar 19 2021, 4:36 PM

Revision Contents
Changeset List

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

Diff 26546

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 p q r o i-0 initial commit: a b h p q r
Subcase: restoring and untouched deleted file, while touching it
````````````````````````````````````````````````````````````````
Merge:
- one removing a file (d)
- one leaving the file untouched
- the merge actively restore the file to the same content.
In this case, the file keep on living after the merge. So we should not drop its
copy tracing chain.
$ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)"
$ hg up 'desc("c-1")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d
$ echo "new content for d after the revert" > d
$ hg ci -m "mCB-change-m-0 $case_desc - one way"
created new head
$ hg manifest --rev . --debug | grep " d"
e333780c17752a3b0dd15e3ad48aa4e5c745f621 644 d (no-changeset !)
4b540a18ad699234b2b2aa18cb69555ac9c4b1df 644 d (changeset !)
$ hg up 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d
$ echo "new content for d after the revert" > d
$ hg ci -m "mBC-change-m-0 $case_desc - the other way"
created new head
$ hg manifest --rev . --debug | grep " d"
e333780c17752a3b0dd15e3ad48aa4e5c745f621 644 d (no-changeset !)
4b540a18ad699234b2b2aa18cb69555ac9c4b1df 644 d (changeset !)
$ hg up null --quiet
$ hg log -G --rev '::(desc("mCB-change-m")+desc("mBC-change-m"))'
o mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
|\
+---o mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
| |/
| o c-1 delete d
| |
o | b-1: b update
|/
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 p q r
Decision from previous merge are properly chained with later merge Decision from previous merge are properly chained with later merge
------------------------------------------------------------------ ------------------------------------------------------------------
Subcase: chaining conflicting rename resolution Subcase: chaining conflicting rename resolution
``````````````````````````````````````````````` ```````````````````````````````````````````````
The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We
add more change on the respective branch and merge again. These second merge add more change on the respective branch and merge again. These second merge
does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
about that file should stay unchanged. about that file should stay unchanged.
We also touch J during some of the merge to check for unrelated change to new file during merge. We also touch J during some of the merge to check for unrelated change to new file during merge.
$ case_desc="chained merges (conflict -> simple) - same content everywhere" $ case_desc="chained merges (conflict -> simple) - same content everywhere"
(extra unrelated changes) (extra unrelated changes)
$ hg up 'desc("a-2")' $ hg up 'desc("a-2")'
3 files updated, 0 files merged, 1 files removed, 0 files unresolved 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo j > unrelated-j $ echo j > unrelated-j
$ hg add unrelated-j $ hg add unrelated-j
$ hg ci -m 'j-1: unrelated changes (based on the "a" series of changes)' $ hg ci -m 'j-1: unrelated changes (based on the "a" series of changes)'
created new head created new head
$ hg up 'desc("e-2")' $ hg up 'desc("e-2")'
2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !) 2 files updated, 0 files merged, 2 files removed, 0 files unresolved (no-changeset !)
1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !) 1 files updated, 0 files merged, 2 files removed, 0 files unresolved (changeset !)
l-1: unrelated changes (based on "c" changes) l-1: unrelated changes (based on "c" changes)
mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
mAE,Km: chained merges (conflict -> simple) - same content everywhere mAE,Km: chained merges (conflict -> simple) - same content everywhere
mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way mAE-change-m-0 merge with file update and copies info on both side - A side: rename d to f, E side: b to f, (same content for f in parent) - one way
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 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
mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
mBCm-1 re-add d mBCm-1 re-add d
mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way mBF-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way mBRm-0 simple merge - B side: unrelated change, R side: overwrite d with a copy (from r->x->t) different content - one way
mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
mCBm-1 re-add d mCBm-1 re-add d
mCGm-0 merge updated/deleted - revive the file (updated content) - one way mCGm-0 merge updated/deleted - revive the file (updated content) - one way
mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way
mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
mEA,Jm: chained merges (conflict -> simple) - same content everywhere mEA,Jm: chained merges (conflict -> simple) - same content everywhere
1 sidedata entries 1 sidedata entries
entry-0014 size 14 entry-0014 size 14
'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !) '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)
touched : d, ; (no-upgraded no-upgraded-parallel !) touched : d, ; (no-upgraded no-upgraded-parallel !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
merged : d, ; (upgraded-parallel known-bad-output !) merged : d, ; (upgraded-parallel known-bad-output !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
merged : d, ; (upgraded known-bad-output !) merged : d, ; (upgraded known-bad-output !)
##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" #####
1 sidedata entries
entry-0014 size 14
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)
salvaged : d, ; (no-upgraded no-upgraded-parallel !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
merged : d, ; (upgraded known-bad-output !)
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !)
salvaged : d, ; (upgraded missing-correct-output !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
merged : d, ; (upgraded-parallel known-bad-output !)
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
salvaged : d, ; (upgraded-parallel missing-correct-output !)
##### revision "mBC-change-m-0 merge explicitely revive deleted file - B side" #####
1 sidedata entries
entry-0014 size 14
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (no-upgraded no-upgraded-parallel !)
salvaged : d, ; (no-upgraded no-upgraded-parallel !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !)
merged : d, ; (upgraded known-bad-output !)
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !)
salvaged : d, ; (upgraded missing-correct-output !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !)
merged : d, ; (upgraded-parallel known-bad-output !)
'\x00\x00\x00\x01\x10\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !)
salvaged : d, ; (upgraded-parallel missing-correct-output !)
##### revision "j-1" ##### ##### revision "j-1" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 24 entry-0014 size 24
'\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j'
added : unrelated-j, ; added : unrelated-j, ;
##### revision "k-1" ##### ##### revision "k-1" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 24 entry-0014 size 24
o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way o mFB-change-m-0 merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
: :
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
Subcase: restoring and untouched deleted file, while touching it
````````````````````````````````````````````````````````````````
Merge:
- one removing a file (d)
- one leaving the file untouched
- the merge actively restore the file to the same content.
In this case, the file keep on living after the merge. So we should not drop its
copy tracing chain.
$ hg log -G --rev '::(desc("mCB-change-m")+desc("mBC-change-m"))'
o mBC-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
|\
+---o mCB-change-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
| |/
| o c-1 delete d
| |
o | b-1: b update
|/
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 p q r
'a' is the the copy source of 'd'
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-change-m-0")'
M b
A d
a (no-compatibility no-changeset no-upgraded no-upgraded-parallel !)
a (upgraded missing-correct-output !)
a (upgraded-parallel missing-correct-output !)
A t
p
R a
R p
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-change-m-0")'
M b
A d
a (no-compatibility no-changeset !)
A t
p
R a
R p
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-change-m-0")'
M b
A d
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-change-m-0")'
M b
A d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCB-change-m-0")'
M d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBC-change-m-0")'
M d
Decision from previous merge are properly chained with later merge Decision from previous merge are properly chained with later merge
------------------------------------------------------------------ ------------------------------------------------------------------
Subcase: chaining conflicting rename resolution Subcase: chaining conflicting rename resolution
``````````````````````````````````````````````` ```````````````````````````````````````````````
The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We