[Pkg-bazaar-commits] ./bzr/unstable r591: - trim imports

[Martin Pool]

------------------------------------------------------------
revno: 591
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-05-30 12:59:39 +1000
message:
  - trim imports
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-05-30 02:21:00 +0000
+++ b/bzrlib/commands.py	2005-05-30 02:59:39 +0000
@@ -26,7 +26,6 @@
 from bzrlib.revision import Revision
 from bzrlib import Branch, Inventory, InventoryEntry, ScratchBranch, BZRDIR, \
      format_date
-from bzrlib import merge
 
 
 def _squish_command_name(cmd):
@@ -998,7 +997,8 @@
     takes_args = ['other_spec', 'base_spec']
 
     def run(self, other_spec, base_spec):
-        merge.merge(parse_spec(other_spec), parse_spec(base_spec))
+        from bzrlib.merge import merge
+        merge(parse_spec(other_spec), parse_spec(base_spec))
 
 class cmd_assert_fail(Command):
     """Test reporting of assertion failures"""