[Pkg-bazaar-commits] ./bzr/unstable r784: - rename merge-based revert command to 'merge-revert'

[Martin Pool]

------------------------------------------------------------
revno: 784
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-06-24 21:12:11 +1000
message:
  - rename merge-based revert command to 'merge-revert'
  - do simple file-based revert with 'revert'
modified:
  bzrlib/commands.py
-------------- next part --------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2005-06-24 10:42:47 +0000
+++ b/bzrlib/commands.py	2005-06-24 11:12:11 +0000
@@ -1234,7 +1234,7 @@
 
 
 
-class cmd_simple_revert(Command):
+class cmd_revert(Command):
     """Restore selected files from a previous revision.
     """
     takes_args = ['file+']
@@ -1247,7 +1247,7 @@
         b.revert([b.relpath(f) for f in file_list])
 
 
-class cmd_revert(Command):
+class cmd_merge_revert(Command):
     """Reverse all changes since the last commit.
 
     Only versioned files are affected.