This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8235

copies-tests: remove extra log call at the end of the chain-merge test file
ClosedPublic

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

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHGbc1786973c6d: copies-tests: remove extra log call at the end of the chain-merge test file
Summary

We do not actually need theses as the graph is displayed earlier anyway. I
think they are the remain of me trying to understand that case better.

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.

Revision Contents
Changeset List

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

Diff 20539

tests/test-copies-chain-merge.t

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
$ hg log -Gfr 'desc("mAEm-0")' f
o 19 mAEm-0 simple merge - one way]
|\
| o 18 e-2 g -move-> f]
| |
| o 17 e-1 b -move-> g]
| |
o | 4 a-2: e -move-> f]
| |
o | 3 a-1: d -move-> e]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]
$ hg log -Gfr 'desc("mEAm-0")' f
@ 20 mEAm-0 simple merge - the other way]
|\
| o 18 e-2 g -move-> f]
| |
| o 17 e-1 b -move-> g]
| |
o | 4 a-2: e -move-> f]
| |
o | 3 a-1: d -move-> e]
|/
o 2 i-2: c -move-> d]
|
o 1 i-1: a -move-> c]
|
o 0 i-0 initial commit: a b]