[Pkg-bazaar-commits] ./bzr/unstable r636: - fix missing import in revert

[Martin Pool]

------------------------------------------------------------
revno: 636
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Tue 2005-06-07 17:04:20 +1000
message:
  - fix missing import in revert
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-06-06 13:19:26 +0000
+++ b/bzrlib/commands.py	2005-06-07 07:04:20 +0000
@@ -1140,6 +1140,7 @@
     takes_options = ['revision']
 
     def run(self, revision=-1):
+        from bzrlib.merge import merge
         merge(('.', revision), parse_spec('.'),
               check_clean=False,
               ignore_zero=True)