[Pkg-bazaar-commits] ./bzr/unstable r640: - bzr pull should not check that the tree is clean

[Martin Pool]

------------------------------------------------------------
revno: 640
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-06-10 11:48:19 +1000
message:
  - bzr pull should not check that the tree is clean
    (from aaron)
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-06-09 04:54:00 +0000
+++ b/bzrlib/commands.py	2005-06-10 01:48:19 +0000
@@ -426,7 +426,7 @@
         except DivergedBranches:
             raise BzrCommandError("These branches have diverged.  Try merge.")
             
-        merge(('.', -1), ('.', old_revno))
+        merge(('.', -1), ('.', old_revno), check_clean=False)
         if location != stored_loc:
             br_to.controlfile("x-pull", "wb").write(location + "\n")