# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1142183113 -3600
# Node ID 622ee75cb4c9aef1fef0e87644ca2781225a27ca
# Parent  e5c8e38b788fd7760106575db1fa8a10e2a56955
Directory names take precedence over symbolic names consistently.
Previously this was only done for clone.


diff -r e5c8e38b788f -r 622ee75cb4c9 mercurial/commands.py
--- a/mercurial/commands.py	Sun Mar 12 15:11:11 2006 +0100
+++ b/mercurial/commands.py	Sun Mar 12 18:05:13 2006 +0100
@@ -718,8 +718,7 @@
     if opts['remotecmd']:
         ui.setconfig("ui", "remotecmd", opts['remotecmd'])
 
-    if not os.path.exists(source):
-        source = ui.expandpath(source)
+    source = ui.expandpath(source)
 
     d = Dircleanup(dest)
     abspath = source
diff -r e5c8e38b788f -r 622ee75cb4c9 mercurial/ui.py
--- a/mercurial/ui.py	Sun Mar 12 15:11:11 2006 +0100
+++ b/mercurial/ui.py	Sun Mar 12 18:05:13 2006 +0100
@@ -154,6 +154,10 @@
         return user
 
     def expandpath(self, loc, root=""):
+        """Return repository location relative to cwd or from [paths]"""
+        if os.path.exists(loc):
+            return loc
+
         paths = {}
         for name, path in self.configitems("paths"):
             m = path.find("://")