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

login
register
mail settings
Submitter phabricator
Date March 5, 2020, 6:14 p.m.
Message ID <differential-rev-PHID-DREV-baw5i4yrufoyhh4v64hn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45521/
State Superseded
Headers show

Comments

phabricator - March 5, 2020, 6:14 p.m.
marmoute created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

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

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-devel
phabricator - March 6, 2020, 8:25 a.m.
This revision now requires changes to proceed.
martinvonz added inline comments.
martinvonz requested changes to this revision.

INLINE COMMENTS

> test-copies-chain-merge.t:260-261
>  Merge:
> -- one with change to an unrelated file
> -- one deleting and recreating the change
> +- the "a-" branch renaming b to f (through 'G')
> +- the "e-" branch renaming d to f (through e)
>  

Looks like you got these reversed.

REPOSITORY
  rHG Mercurial

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

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

To: marmoute, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
phabricator - March 6, 2020, 10:20 a.m.
marmoute added inline comments.
marmoute marked an inline comment as done.

INLINE COMMENTS

> martinvonz wrote in test-copies-chain-merge.t:260-261
> Looks like you got these reversed.

indeed. fixed.

REPOSITORY
  rHG Mercurial

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

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

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 "a-" branch renaming b to f (through 'G')
+- the "e-" 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 "a-" branch renaming b to f (through 'G')
+- the "e-" branch renaming d to f (through e)
 
   $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644   f'
   eb806e34ef6be4c264effd5933d31004ad15a793 644   f