Rev 4621: Option test pass. in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4621
revision-id: v.ladeuil+lp at free.fr-20091016132213-otik44uv0nfpvr4z
parent: v.ladeuil+lp at free.fr-20091016131347-iq5r1y8p6r9fj9m1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Fri 2009-10-16 15:22:13 +0200
message:
  Option test pass.
  
  * bzrlib/conflicts.py:
  (cmd_resolve): Add the interactive option.
-------------- next part --------------
=== modified file 'bzrlib/conflicts.py'
--- a/bzrlib/conflicts.py	2009-09-01 16:19:06 +0000
+++ b/bzrlib/conflicts.py	2009-10-16 13:22:13 +0000
@@ -91,8 +91,9 @@
     takes_args = ['file*']
     takes_options = [
             Option('all', help='Resolve all conflicts in this tree.'),
+            Option('interactive', help='Dialog-based resolution'),
             ]
-    def run(self, file_list=None, all=False):
+    def run(self, file_list=None, all=False, interactive=False):
         from bzrlib.workingtree import WorkingTree
         if all:
             if file_list: