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

login
register
mail settings
Submitter phabricator
Date March 7, 2020, 12:30 a.m.
Message ID <14b6617a9060752fe222566dbd187fb1@localhost.localdomain>
Download mbox | patch
Permalink /patch/45603/
State Not Applicable
Headers show

Comments

phabricator - March 7, 2020, 12:30 a.m.
Closed by commit rHG275365d85e3f: copies-tests: clarify the description of the EA/AE cases (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8238?vs=20589&id=20600

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8238/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8238

AFFECTED FILES
  tests/test-copies-chain-merge.t

CHANGE DETAILS




To: marmoute, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel

Patch

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 @@ 
   
 
 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 @@ 
   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