This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10218

test-copies: show some wrong ChangedFiles upgrade
ClosedPublic

Authored by marmoute on Mar 15 2021, 10:19 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe4696ba43ecd: test-copies: show some wrong ChangedFiles upgrade
Summary

For file present only on one side and touched during merge, the upgrade code
confused them as "merged". However they should be either "touched", or
"salvaged" but they are currently recorded as "merged". See the next changesets
for more details on these cases and fix.

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 15 2021, 10:19 AM
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 26517.Mar 19 2021, 4:36 PM
marmoute added a commit: rHGe4696ba43ecd: test-copies: show some wrong ChangedFiles upgrade.Mar 22 2021, 2:29 PM
Closed by commit rHGe4696ba43ecd: test-copies: show some wrong ChangedFiles upgrade (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 (26 lines)

Diff 26545

tests/test-copies-chain-merge.t

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.
$ 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 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo j > unrelated-j $ echo j > unrelated-j
$ hg add unrelated-j $ hg add unrelated-j
(merge variant 3) (merge variant 3)
$ hg up 'desc("mEAm")' $ hg up 'desc("mEAm")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("j-1")' $ hg merge 'desc("j-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)
$ echo jj > unrelated-j
$ hg ci -m "mEA,Jm: $case_desc" $ hg ci -m "mEA,Jm: $case_desc"
(merge variant 4) (merge variant 4)
$ hg up 'desc("j-1")' $ hg up 'desc("j-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
$ hg merge 'desc("mEAm")' $ hg merge 'desc("mEAm")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ echo jj > unrelated-j
$ hg ci -m "mJ,EAm: $case_desc" $ hg ci -m "mJ,EAm: $case_desc"
created new head created new head
$ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))' $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))'
@ mJ,EAm: chained merges (conflict -> simple) - same content everywhere @ mJ,EAm: chained merges (conflict -> simple) - same content everywhere
|\ |\
+---o mEA,Jm: chained merges (conflict -> simple) - same content everywhere +---o mEA,Jm: chained merges (conflict -> simple) - same content everywhere
entry-0014 size 4 entry-0014 size 4
'\x00\x00\x00\x00' '\x00\x00\x00\x00'
##### revision "mK,AEm" ##### ##### revision "mK,AEm" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 4 entry-0014 size 4
'\x00\x00\x00\x00' '\x00\x00\x00\x00'
##### revision "mEA,Jm" ##### ##### revision "mEA,Jm" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 4 entry-0014 size 24
'\x00\x00\x00\x00' '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)
touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
merged : unrelated-j, ; (upgraded known-bad-output !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
##### revision "mJ,EAm" ##### ##### revision "mJ,EAm" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 4 entry-0014 size 24
'\x00\x00\x00\x00' '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)
touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
merged : unrelated-j, ; (upgraded known-bad-output !)
'\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
##### revision "s-1" ##### ##### revision "s-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-s' '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s'
added : unrelated-s, ; added : unrelated-s, ;
##### revision "t-1" ##### ##### revision "t-1" #####
1 sidedata entries 1 sidedata entries
entry-0014 size 24 entry-0014 size 24