[Pkg-bazaar-commits] ./bzr/unstable r698: - bzr branch shouldn't say "0 conflicts"

[Martin Pool]

------------------------------------------------------------
revno: 698
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-06-20 11:32:42 +1000
message:
  - bzr branch shouldn't say "0 conflicts"
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-06-17 07:28:53 +0000
+++ b/bzrlib/commands.py	2005-06-20 01:32:42 +0000
@@ -572,7 +572,7 @@
                                                          revision)
             raise BzrCommandError(msg)
         merge((to_location, -1), (to_location, 0), this_dir=to_location,
-              check_clean=False)
+              check_clean=False, ignore_zero=True)
         from_location = pull_loc(br_from)
         br_to.controlfile("x-pull", "wb").write(from_location + "\n")