This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8240

copies-tests: add a test with a rename overwriting another file
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG890def17d03b: copies-tests: add a test with a rename overwriting another file
Summary

This is a variation of the "BD" case, but this time, the file is not "new", it
is overwritten by another file being renamed.

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 20547.Mar 6 2020, 5:21 AM
martinvonz added a subscriber: martinvonz.Mar 6 2020, 11:33 AM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
349

unrelated to this patch, but maybe we can also remove this final summary? i've never looked at it while reviewing theses patches and i don't feel like i've missed anything as a result.

marmoute added a comment.Mar 6 2020, 11:35 AM

Yes, it

tests/test-copies-chain-merge.t
349

Yes, it was more useful at the begining, when less branch were involved?

martinvonz added inline comments.Mar 6 2020, 12:30 PM
tests/test-copies-chain-merge.t
349

Okay, want to send a patch removing it then? Ideally that patch would come early in the series so the other patches (like this one) would get simpler.

marmoute added inline comments.Mar 6 2020, 5:55 PM
tests/test-copies-chain-merge.t
349

Yes, my previous message implied I would do so in the next iteration.

[grmlm, comment not sent]

marmoute updated this revision to Diff 20592.Mar 6 2020, 6:51 PM

series update after Martin feedback

marmoute added a commit: rHG890def17d03b: copies-tests: add a test with a rename overwriting another file.Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG890def17d03b: copies-tests: add a test with a rename overwriting another file (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 (151 lines)

Diff 20530

tests/test-copies-chain-merge.t

| |
o 0 i-0 initial commit: a b] o 0 i-0 initial commit: a b]
Note: Note:
| In this case, on of the merge record bad information and fails to see that | In this case, on of the merge record bad information and fails to see that
| there is no merge going on. | there is no merge going on.
Merge:
- one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d)
$ hg up 'desc("i-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv h i
$ hg commit -m "f-1: rename h -> i"
created new head
$ hg mv --force i d
$ hg commit -m "f-2: rename i -> d"
$ hg debugindex d
rev linkrev nodeid p1 p2
0 2 01c2f5eabdc4 000000000000 000000000000
1 10 b004912a8510 000000000000 000000000000
2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
3 22 c72365ee036f 000000000000 000000000000
$ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBFm-0 simple merge - one way'
$ hg up 'desc("f-2")'
2 files updated, 0 files merged, 0 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 ci -m 'mFBm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
@ 24 mFBm-0 simple merge - the other way]
|\
+---o 23 mBFm-0 simple merge - one way]
| |/
| o 22 f-2: rename i -> d]
| |
| o 21 f-1: rename h -> i]
| |
o | 5 b-1: b update]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]
final summary final summary
martinvonzUnsubmitted
Not Done

unrelated to this patch, but maybe we can also remove this final summary? i've never looked at it while reviewing theses patches and i don't feel like i've missed anything as a result.

martinvonz: unrelated to this patch, but maybe we can also remove this final summary? i've never looked at…
marmouteAuthorUnsubmitted
Done

Yes, it was more useful at the begining, when less branch were involved?

marmoute: Yes, it was more useful at the begining, when less branch were involved?
martinvonzUnsubmitted
Not Done

Okay, want to send a patch removing it then? Ideally that patch would come early in the series so the other patches (like this one) would get simpler.

martinvonz: Okay, want to send a patch removing it then? Ideally that patch would come early in the series…
marmouteAuthorUnsubmitted
Done

Yes, my previous message implied I would do so in the next iteration.

[grmlm, comment not sent]

marmoute: Yes, my previous message implied I would do so in the next iteration. [grmlm, comment not sent]
$ hg update null --quiet $ hg update null --quiet
$ hg log -G $ hg log -G
o 20 mEAm-0 simple merge - the other way] o 24 mFBm-0 simple merge - the other way]
|\ |\
+---o 19 mAEm-0 simple merge - one way] +---o 23 mBFm-0 simple merge - one way]
| |/ | |/
| o 18 e-2 g -move-> f] | o 22 f-2: rename i -> d]
| | | |
| o 17 e-1 b -move-> g] | o 21 f-1: rename h -> i]
| | | |
| | o 16 mDBm-0 simple merge - the other way] | | o 20 mEAm-0 simple merge - the other way]
| | |\ | | |\
| | +---o 15 mBDm-0 simple merge - one way] | | +---o 19 mAEm-0 simple merge - one way]
| | | |/
| | | o 18 e-2 g -move-> f]
| | | |
| +---o 17 e-1 b -move-> g]
| | |
+-----o 16 mDBm-0 simple merge - the other way]
| | | |
+-------o 15 mBDm-0 simple merge - one way]
| | | |/ | | | |/
| | | o 14 d-2 re-add d] | | | o 14 d-2 re-add d]
| | | | | | | |
| +---o 13 d-1 delete d] | +---o 13 d-1 delete d]
| | | | | |
| | | o 12 mCBm-1 re-add d] | | | o 12 mCBm-1 re-add d]
| | | | | | | |
| | | o 11 mCBm-0 simple merge - the other way] +-----o 11 mCBm-0 simple merge - the other way]
| | |/| | | | |
| | | | o 10 mBCm-1 re-add d] | | | | o 10 mBCm-1 re-add d]
| | | | | | | | | |
| | +---o 9 mBCm-0 simple merge - one way] +-------o 9 mBCm-0 simple merge - one way]
| | | |/ | | | |/
| +---o 8 c-1 delete d] | +---o 8 c-1 delete d]
| | | | | |
+-----o 7 mABm-0 simple merge - the other way] +-----o 7 mABm-0 simple merge - the other way]
| | |/ | | |/
+-----o 6 mBAm-0 simple merge - one way] +-----o 6 mBAm-0 simple merge - one way]
| | |/ | | |/
| | o 5 b-1: b update] o | | 5 b-1: b update]
| |/ |/ /
o | 4 a-2: e -move-> f] | o 4 a-2: e -move-> f]
| | | |
o | 3 a-1: d -move-> e] | o 3 a-1: d -move-> e]
|/ |/
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] o 0 i-0 initial commit: a b]
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 10 b004912a8510 000000000000 000000000000 1 10 b004912a8510 000000000000 000000000000
2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 2 15 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
3 22 c72365ee036f 000000000000 000000000000
4 23 863d9bc49190 01c2f5eabdc4 c72365ee036f
(That output if wrong, since no merge actually happened). (That 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]
:/ :/
a a
R a R a
R b R b
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")'
A f A f
a a
R a R a
R b R b
Merge:
- one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d)
The overwriting should take over. However, the behavior is currently buggy
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
M b
A d
a (true !)
h (false !)
R a
R h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
M b
A d
h
R a
R h
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")'
M d
R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")'
M b
M d
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")'
M b
M d
R i
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")'
M d
R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")'
M b
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
M b
M d
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
o 23 mBFm-0 simple merge - one way]
|\
o : 22 f-2: rename i -> d]
| :
o : 21 f-1: rename h -> i]
:/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]
The following output is correct.
$ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d]
|
o 21 f-1: rename h -> i]
:
o 0 i-0 initial commit: a b]