# HG changeset patch # User Pierre-Yves David # Date 2020-03-03 12:18:31 # Node ID 275365d85e3f53aacbd91727e321d96c4877386d # Parent b8882f5d7cb49851f34600d60313671b31bce3fd copies-tests: clarify the description of the EA/AE cases The previous description of the merge was just wrong. (It seems the result a non-updated copy-paste) Differential Revision: https://phab.mercurial-scm.org/D8238 diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -257,8 +257,8 @@ Having another branch renaming a differe Merge: -- one with change to an unrelated file -- one deleting and recreating the change +- the "e-" branch renaming b to f (through 'g') +- the "a-" branch renaming d to f (through e) $ hg up 'desc("a-2")' 2 files updated, 0 files merged, 1 files removed, 0 files unresolved @@ -525,11 +525,11 @@ This `hg log` output is correct A d 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 -- one deleting and recreating the change +- the "e-" branch renaming b to f (through 'g') +- the "a-" branch renaming d to f (through e) $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' eb806e34ef6be4c264effd5933d31004ad15a793 644 f