From patchwork Thu Nov 19 21:33:59 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [7, of, 7, mergedriver] filemerge: don't try using external tools on
 change/delete conflicts
From: Siddharth Agarwal <sid0@fb.com>
X-Patchwork-Id: 11539
Message-Id: <4b90631e13b8d474a808.1447968839@dev666.prn1.facebook.com>
To: <mercurial-devel@selenic.com>
Date: Thu, 19 Nov 2015 13:33:59 -0800

# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447487863 28800
#      Fri Nov 13 23:57:43 2015 -0800
# Node ID 4b90631e13b8d474a808f68733047a8c48c7b80c
# Parent  2bdd5467ac12506533d343f811efef690b88261c
# Available At http://42.netv6.net/sid0-wip/hg/
#              hg pull http://42.netv6.net/sid0-wip/hg/ -r 4b90631e13b8
filemerge: don't try using external tools on change/delete conflicts

This is mostly for completeness' sake -- the current code shouldn't get to this
point.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -447,6 +447,10 @@ def _idump(repo, mynode, orig, fcd, fco,
 
 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     tool, toolpath, binary, symlink = toolconf
+    if fcd.isabsent() or fco.isabsent():
+        repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
+                       'for %s\n') % (tool, fcd.path()))
+        return False, 1, None
     a, b, c, back = files
     out = ""
     env = {'HG_FILE': fcd.path(),