This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7075

copies: add an explicit test using multiple roots
ClosedPublic

Authored by marmoute on Oct 12 2019, 12:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdda9482f60d2: copies: add an explicit test using multiple roots
Summary

We explicitly add a test checking for copies of connected revision but involving
a different roots. This make sure the copies coming purely from the new roots
does not interfere with the merge.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

marmoute created this revision.Oct 12 2019, 12:47 PM
martinvonz added a subscriber: martinvonz.Oct 15 2019, 1:32 AM
martinvonz added inline comments.
tests/test-copies-unrelated.t
398

nit: maybe "involving *merge* of multiple roots" to clarify how it's different from the case above

403–406

nit: These seem unlikely to have any effect on the result. remove them? Or at least one of them? OTOH, you seem to have deliberately made the contents match in revision 2 and revision 7. What's the reason for that? Did that trigger a bug in an earlier version of this series?

marmoute updated this revision to Diff 17277.Oct 16 2019, 6:56 PM
marmoute added inline comments.Oct 17 2019, 4:44 PM
tests/test-copies-unrelated.t
403–406

I don't want to write too simple test. There are various optimisation to have around revision without copy informations. So I am adding them in various situation to cache potential error if we introduce such optimisation.

The content match is just here so that `hg merge does not complains about a content conflicT)

marmoute added a commit: rHGdda9482f60d2: copies: add an explicit test using multiple roots.Oct 19 2019, 1:38 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdda9482f60d2: copies: add an explicit test using multiple roots (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-unrelated.t (60 lines)

Diff 17115

tests/test-copies-unrelated.t

o 1 copy x to y o 1 copy x to y
| y | y
o 0 add x o 0 add x
x x
$ hg debugpathcopies 1 2 $ hg debugpathcopies 1 2
$ hg debugpathcopies 2 1 $ hg debugpathcopies 2 1
$ hg graft -r 1 $ hg graft -r 1
grafting 1:* "copy x to y" (glob) grafting 1:* "copy x to y" (glob)
Copies involving multiple roots.
martinvonzUnsubmitted
Not Done

nit: maybe "involving *merge* of multiple roots" to clarify how it's different from the case above

martinvonz: nit: maybe "involving *merge* of multiple roots" to clarify how it's different from the case…
$ newrepo
$ echo a > a
$ hg ci -Aqm 'add a'
$ echo a >> a
$ hg ci -Aqm 'update a'
$ echo a >> a
$ hg ci -Aqm 'update a'
martinvonzUnsubmitted
Not Done

nit: These seem unlikely to have any effect on the result. remove them? Or at least one of them? OTOH, you seem to have deliberately made the contents match in revision 2 and revision 7. What's the reason for that? Did that trigger a bug in an earlier version of this series?

martinvonz: nit: These seem unlikely to have any effect on the result. remove them? Or at least one of them?
marmouteAuthorUnsubmitted
Done

I don't want to write too simple test. There are various optimisation to have around revision without copy informations. So I am adding them in various situation to cache potential error if we introduce such optimisation.

The content match is just here so that `hg merge does not complains about a content conflicT)

marmoute: I don't want to write too simple test. There are various optimisation to have around revision…
$ hg up null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > a
$ hg ci -Aqm 'add a'
$ hg mv a b
$ hg ci -Aqm 'move a to b'
$ echo b >> b
$ hg ci -Aqm 'update b'
$ hg merge 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge with other branch"
$ echo a >> a
$ echo a >> a
$ echo b >> b
$ hg ci -Aqm 'update a and b'
$ hg l
@ 7 update a and b
| a b
o 6 merge with other branch
|\
| o 5 update b
| | b
| o 4 move a to b
| | a b
| o 3 add a
| a
| o 2 update a
| | a
| o 1 update a
|/ a
o 0 add a
a
$ hg cat a -r 7
a
a
a
$ hg cat a -r 2
a
a
a
$ hg cat a -r 0
a
$ hg debugpathcopies 7 2
$ hg debugpathcopies 2 7
$ hg merge 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)