Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 15381:c519cd8f0169 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout dbdb777502dc (issue3077) (issue3071) Using util.realpath turns out to create complex issues on both Mac and Windows. Back this change out for the release.
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Oct 2011 11:02:23 -0500
parents dbdb777502dc
children 7de7630053cb
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Fri Oct 28 15:00:21 2011 +0200
+++ b/mercurial/simplemerge.py	Sat Oct 29 11:02:23 2011 -0500
@@ -430,7 +430,7 @@
     except util.Abort:
         return 1
 
-    local = util.realpath(local)
+    local = os.path.realpath(local)
     if not opts.get('print'):
         opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)