Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: don't try using external tools on change/delete conflicts
authorSiddharth Agarwal <sid0@fb.com>
Fri, 13 Nov 2015 23:57:43 -0800
changeset 27042 30b919bc49bf
parent 27041 0e330f59ef68
child 27043 ccdc95c6841e
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.
mercurial/filemerge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/filemerge.py	Fri Nov 13 23:56:00 2015 -0800
+++ b/mercurial/filemerge.py	Fri Nov 13 23:57:43 2015 -0800
@@ -447,6 +447,10 @@
 
 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(),
hg-stable