Mercurial > hg
diff tests/test-histedit-non-commute-abort.t @ 46811:5a0b930cfb3e
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 | acbfa31cfaf2 |
children | f27a83399abb |
line wrap: on
line diff
--- a/tests/test-histedit-non-commute-abort.t Wed Mar 17 20:06:35 2021 +0100 +++ b/tests/test-histedit-non-commute-abort.t Wed Mar 10 13:14:32 2021 +0530 @@ -84,6 +84,7 @@ ancestor path: e (node 0000000000000000000000000000000000000000) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) extra: ancestorlinknode = 0000000000000000000000000000000000000000 + extra: merged = yes $ hg resolve -l U e