Patchwork [3,of,5,mergedriver,V2] merge.mergedriver: don't try resolving files marked driver-resolved

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 13, 2015, 10:10 p.m.
Message ID <ef0fa195b1e2a7763dff.1444774216@dev6666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/11036/
State Accepted
Headers show

Comments

Siddharth Agarwal - Oct. 13, 2015, 10:10 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1443667431 25200
#      Wed Sep 30 19:43:51 2015 -0700
# Node ID ef0fa195b1e2a7763dff02dabe670b7cca3c69c5
# Parent  92f202bf94b72ce19a979b71aa973aa54dea9cc4
merge.mergedriver: don't try resolving files marked driver-resolved

The driver is expected to take care of these.

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -331,7 +331,7 @@  class mergestate(object):
 
     def _resolve(self, preresolve, dfile, wctx, labels=None):
         """rerun merge process for file path `dfile`"""
-        if self[dfile] == 'r':
+        if self[dfile] in 'rd':
             return True, 0
         stateentry = self._state[dfile]
         state, hash, lfile, afile, anode, ofile, onode, flags = stateentry