From 258f79e55941381d98c5bebd1c3b594cee24acc4 Mon Sep 17 00:00:00 2001
From: Siddharth Agarwal <sid0@fb.com>
Date: Tue, 6 Oct 2015 22:56:33 -0700
Subject: [PATCH] filemerge: add a precheck for symlinks

This will be used by internal merge tools.
---
 mercurial/filemerge.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
index 61e10ea3a9..cabb5776bc 100644
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -228,6 +228,14 @@ def _premerge(repo, toolconf, files, labels=None):
             util.copyfile(back, a) # restore from backup and try again
     return 1 # continue merging
 
+def _symlinkcheck(repo, mynode, orig, fcd, fco, fca, toolconf):
+    tool, toolpath, binary, symlink = toolconf
+    if symlink:
+        repo.ui.warn(_('warning: internal :merge cannot merge symlinks '
+                       'for %s\n') % fcd.path())
+        return False
+    return True
+
 def _merge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels, mode):
     """
     Uses the internal non-interactive simple merge algorithm for merging