This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9168

tests: update/remove outdated comments in test-copies-chain-merge.t
ClosedPublic

Authored by pulkit on Oct 7 2020, 3:58 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa357688e3c9c: tests: update/remove outdated comments in test-copies-chain-merge.t
Summary

1b8fd4af3318 fixed the test case but missed updating the comments mentioning the
bug. Thanks for @martinvonz who spotted these outdated comments.

Diff Detail

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

Event Timeline

pulkit created this revision.Oct 7 2020, 3:58 AM
pulkit added a commit: rHGa357688e3c9c: tests: update/remove outdated comments in test-copies-chain-merge.t.Oct 7 2020, 10:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGa357688e3c9c: tests: update/remove outdated comments in test-copies-chain-merge.t (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 23074

tests/test-copies-chain-merge.t

Comparing with a merge re-adding the file afterward Comparing with a merge re-adding the file afterward
--------------------------------------------------- ---------------------------------------------------
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the change - one deleting and recreating the change
Note:
| In this case, one of the merge wrongly record a merge while there is none.
| This lead to bad copy tracing information to be dug up.
$ hg up 'desc("b-1")' $ hg up '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
$ hg merge 'desc("d-2")' $ hg merge '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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBDm-0 simple merge - one way' $ hg ci -m 'mBDm-0 simple merge - one way'
$ 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
The bugs makes recorded copy is different depending of where we started the merge from since The bugs makes recorded copy is different depending of where we started the merge from since
$ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
The 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 entry is wrong, since the file was
deleted on one side (then recreate) and untouched on the other side, no "merge"
has happened. The resulting `d` file is the untouched version from branch `D`,
not a merge.
$ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
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 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
(This `hg log` output if wrong, since no merge actually happened). Log output should not include a merge commit as it did not happen
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
This `hg log` output is correct
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
M b M b
A d A d
o | 5 b-1: b update o | 5 b-1: b update
|/ |/
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
The overwriting should take over. However, the behavior is currently buggy
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
M b M b
A d A d
h h
h (false !)
R a R a
R h R h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
M b M b
A d A d
h h
R a R a
R h R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")'
M b M b
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
M b M b
M d M d
i (no-filelog !) i (no-filelog !)
R i R i
The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear.
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-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
The following output is correct.
$ 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