Mercurial > hg

diff tests/test-backout.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 8d72e29ad1e0
children e9d588b28710
line wrap: on
line diff
--- a/tests/test-backout.t	Wed Mar 17 20:06:35 2021 +0100
+++ b/tests/test-backout.t	Wed Mar 10 13:14:32 2021 +0530
@@ -718,6 +718,7 @@
     ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
     other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
     extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
+    extra: merged = yes
   $ mv .hg/merge/state2 .hg/merge/state2-moved
   $ hg debugmergestate -v
   no version 2 merge state