Mercurial > public > mercurial-scm > hg-stable

diff mercurial/simplemerge.py @ 15355:dbdb777502dc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
consistency: use util.realpath instead of os.path.realpath where useful exceptions: hg: os.path.realpath used before util can be imported tests/run-tests.py: may not import mercurial modules
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 24 Oct 2011 13:51:24 +0200
parents 774da7121fc9
children c519cd8f0169
line wrap: on
line diff
--- a/mercurial/simplemerge.py	Mon Oct 24 13:54:59 2011 +0200
+++ b/mercurial/simplemerge.py	Mon Oct 24 13:51:24 2011 +0200
@@ -430,7 +430,7 @@
     except util.Abort:
         return 1
 
-    local = os.path.realpath(local)
+    local = util.realpath(local)
     if not opts.get('print'):
         opener = scmutil.opener(os.path.dirname(local))
         out = opener(os.path.basename(local), "w", atomictemp=True)