Patchwork D6323: tests: demonstrate that rename is followed to wrong parent from merge

login
register
mail settings
Submitter phabricator
Date April 28, 2019, 8:39 a.m.
Message ID <3be4cdc090590ba032e2dc14397f9426@localhost.localdomain>
Download mbox | patch
Permalink /patch/39884/
State Not Applicable
Headers show

Comments

phabricator - April 28, 2019, 8:39 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG618b9ffefa87: tests: demonstrate that rename is followed to wrong parent from merge (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6323?vs=14942&id=14956

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

AFFECTED FILES
  tests/test-commit-amend.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t
--- a/tests/test-commit-amend.t
+++ b/tests/test-commit-amend.t
@@ -783,6 +783,21 @@ 
   
   $ hg debugrename aaa
   aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
+
+Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists
+in p1 too, but it was recorded as copied from p2.
+  $ echo modified >> aaa
+BROKEN: should not be follow the rename back to 'aa' here, since the rename
+happened compared to p2
+  $ hg co -m '.^' -t :merge3
+  merging aaa and aa to aa
+  warning: conflicts while merging aa! (edit, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 1 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]
+  $ hg co -C tip
+  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
   $ hg mv aaa aa
   $ hg ci --amend -m 'merge bar again (undo rename)'
   $ hg log --config diff.git=1 -pr .