Mercurial > public > mercurial-scm > hg-stable

diff mercurial/filemerge.py @ 18325:297bf69966a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: warn when internal:merge cannot merge symlinks A follow-up to d084df89d948. internal:merge should never be picked for merging symlinks ... but in the test suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool cleverness. Without any output it can be hard to figure out what happened and where the problem is.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 01:05:11 +0100
parents a35d0128545e
children c58b6ab4c26f
line wrap: on
line diff
--- a/mercurial/filemerge.py	Mon Jan 14 10:17:06 2013 -0600
+++ b/mercurial/filemerge.py	Tue Jan 15 01:05:11 2013 +0100
@@ -208,6 +208,8 @@
     the partially merged file."""
     tool, toolpath, binary, symlink = toolconf
     if symlink:
+        repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
+                       'for %s\n') % fcd.path())
         return False, 1
 
     r = _premerge(repo, toolconf, files)