Mercurial > hg > pyhgsh

changeset 1315:32f6cae83db7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix setting of hg default when using --pull on clone of local repository.
author Lee Cantey <lcantey@gmail.com>
date Thu, 22 Sep 2005 09:47:27 -0700
parents d37a46859acd
children b650bfdfc7ee
files mercurial/commands.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Thu Sep 22 09:47:03 2005 -0700
+++ b/mercurial/commands.py	Thu Sep 22 09:47:27 2005 -0700
@@ -630,10 +630,11 @@
     other = hg.repository(ui, source)
 
     copy = False
-    if not opts['pull'] and other.dev() != -1:
+    if other.dev() != -1:
         abspath = os.path.abspath(source)
-        copy = True
-
+        if not opts['pull']:
+            copy = True
+        
     if copy:
         try:
             # we use a lock here because if we race with commit, we