Patchwork [3,of,5] merge.applyupdates: pass in branch merge info

login
register
mail settings
Submitter Siddharth Agarwal
Date Nov. 3, 2015, 6:23 a.m.
Message ID <829d0c9e0591c5a90e64.1446531812@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11270/
State Changes Requested
Headers show

Comments

Siddharth Agarwal - Nov. 3, 2015, 6:23 a.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446520126 28800
#      Mon Nov 02 19:08:46 2015 -0800
# Node ID 829d0c9e0591c5a90e64da8396575c536bcf9805
# Parent  2756d2b5471bdf69b77e8b268afc9c24cd68f224
merge.applyupdates: pass in branch merge info

This will be used to initialize the merge state in an upcoming patch.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -824,7 +824,8 @@  def batchget(repo, mctx, actions):
     if i > 0:
         yield i, f
 
-def applyupdates(repo, actions, wctx, mctx, overwrite, labels=None):
+def applyupdates(repo, actions, wctx, mctx, branchmerge, overwrite,
+                 labels=None):
     """apply the merge action list to the working directory
 
     wctx is the working copy context
@@ -1276,7 +1277,8 @@  def update(repo, node, branchmerge, forc
             # note that we're in the middle of an update
             repo.vfs.write('updatestate', p2.hex())
 
-        stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
+        stats = applyupdates(repo, actions, wc, p2, branchmerge, overwrite,
+                             labels=labels)
 
         # divergent renames
         for f, fl in sorted(diverge.iteritems()):