author | Lee Cantey <lcantey@gmail.com> |
Thu, 22 Sep 2005 09:47:27 -0700 | |
changeset 1315 | 32f6cae83db7 |
parent 1314 | d37a46859acd |
child 1316 | b650bfdfc7ee |
--- 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