Mercurial > hg

diff tests/test-rebase-abort.t @ 46811:5a0b930cfb3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: get info from mergestate whether a file was merged or not While commiting a merge, the commit code does not know whether a file was merged during `hg merge` or not. This leads the commit code to look for filelog ancestor to choose parents of new filelog created on merge commit. This leads to wrong results in some cases as demonstrated by previous patch. From this patch, we start storing information about merged files in mergestate in stateextras and then use that on commit to detect whether we need to set two parents or not. Differential Revision: https://phab.mercurial-scm.org/D10149
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 10 Mar 2021 13:14:32 +0530
parents 527ce85c2e60
children ff12f42415f5
line wrap: on
line diff
--- a/tests/test-rebase-abort.t	Wed Mar 17 20:06:35 2021 +0100
+++ b/tests/test-rebase-abort.t	Wed Mar 10 13:14:32 2021 +0530
@@ -95,6 +95,7 @@
     ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
     other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
     extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c
+    extra: merged = yes
   $ hg resolve -l
   U common