This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8238

copies-tests: clarify the description of the EA/AE cases
ClosedPublic

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

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG275365d85e3f: copies-tests: clarify the description of the EA/AE cases
Summary

The previous description of the merge was just wrong.
(It seems the result a non-updated copy-paste)

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 5 2020, 1:14 PM
martinvonz requested changes to this revision.Mar 6 2020, 3:24 AM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
tests/test-copies-chain-merge.t
260–262

Looks like you got these reversed.

This revision now requires changes to proceed.Mar 6 2020, 3:24 AM
marmoute marked an inline comment as done.Mar 6 2020, 5:20 AM
marmoute added inline comments.
tests/test-copies-chain-merge.t
260–262

indeed. fixed.

marmoute marked an inline comment as done.Mar 6 2020, 5:21 AM
marmoute updated this revision to Diff 20545.
marmoute updated this revision to Diff 20589.Mar 6 2020, 6:51 PM

series update after Martin feedback

marmoute added a commit: rHG275365d85e3f: copies-tests: clarify the description of the EA/AE cases.Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG275365d85e3f: copies-tests: clarify the description of the EA/AE cases (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 (12 lines)

Diff 20600

tests/test-copies-chain-merge.t

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]
Merge: Merge:
- one with change to an unrelated file - the "e-" branch renaming b to f (through 'g')
- one deleting and recreating the change - the "a-" branch renaming d to f (through e)
martinvonzUnsubmitted
Done

Looks like you got these reversed.

martinvonz: Looks like you got these reversed.
marmouteAuthorUnsubmitted
Done

indeed. fixed.

marmoute: indeed. fixed.
$ hg up 'desc("a-2")' $ hg up 'desc("a-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("e-2")' $ hg merge 'desc("e-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mAEm-0 simple merge - one way' $ hg ci -m 'mAEm-0 simple merge - one way'
$ hg up 'desc("e-2")' $ hg up 'desc("e-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
A d A d
a a
R a R a
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
M b M b
A d A d
R a R a
Comparing with a merge re-adding the file afterward Comparing with a merge with colliding rename
--------------------------------------------------- --------------------------------------------
- one with change to an unrelated file - the "e-" branch renaming b to f (through 'g')
- one deleting and recreating the change - the "a-" branch renaming d to f (through e)
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
eb806e34ef6be4c264effd5933d31004ad15a793 644 f eb806e34ef6be4c264effd5933d31004ad15a793 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
eb806e34ef6be4c264effd5933d31004ad15a793 644 f eb806e34ef6be4c264effd5933d31004ad15a793 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 f 0dd616bc7ab1a111921d95d76f69cda5c2ac539c 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'