Mercurial > hg

changeset 18257:a35d0128545e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: never do premerge on symlinks Simplemerge is not symlink aware and will never do the right thing on symlinks.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 08 Jan 2013 04:15:46 +0100
parents d084df89d948
children bebb05a7e249
files mercurial/filemerge.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/filemerge.py	Tue Jan 08 04:15:41 2013 +0100
+++ b/mercurial/filemerge.py	Tue Jan 08 04:15:46 2013 +0100
@@ -171,13 +171,15 @@
 
 def _premerge(repo, toolconf, files):
     tool, toolpath, binary, symlink = toolconf
+    if symlink:
+        return 1
     a, b, c, back = files
 
     ui = repo.ui
 
     # do we attempt to simplemerge first?
     try:
-        premerge = _toolbool(ui, tool, "premerge", not (binary or symlink))
+        premerge = _toolbool(ui, tool, "premerge", not binary)
     except error.ConfigError:
         premerge = _toolstr(ui, tool, "premerge").lower()
         valid = 'keep'.split()