[Pkg-bazaar-commits] ./bzr/unstable r917: - patch for merge-revert

[Martin Pool]

------------------------------------------------------------
revno: 917
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Wed 2005-07-13 15:34:13 +1000
message:
  - patch for merge-revert
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-07-12 01:30:55 +0000
+++ b/bzrlib/commands.py	2005-07-13 05:34:13 +0000
@@ -1402,7 +1402,7 @@
     def run(self, revision=None):
         from bzrlib.merge import merge
         if revision is None:
-            revision = -1
+            revision = [-1]
         elif len(revision) != 1:
             raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
         merge(('.', revision[0]), parse_spec('.'),