Nix warning on edit collision since we do that now

[mw] / src / mw / clicommands.py

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index e02ec798eb589507afe6fe2984ed7f0e8422c3a2..f4b9813938540b0bbfd33cfb04df24f33f4897b1 100644 (file)
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -205,10 +205,6 @@ class CommitCommand(CommandBase):
         if nothing_to_commit:
             print 'nothing to commit'
             sys.exit()
-        print
-        print 'WARNING: mw does not do collision detection yet.'
-        print 'Hit ^C now if you haven\'t double checked, otherwise hit Enter'
-        raw_input()
         if self.options.edit_summary == None:
             print 'Edit summary:',
             edit_summary = raw_input()
@@ -230,7 +226,6 @@ class CommitCommand(CommandBase):
                 if revid != awaitedrevid :
                      print "Ignoring %s - Edition conflict detected %s - %s " % ( file , awaitedrevid, revid)
                      continue
-                raw_input()
                 edittoken = response['query']['pages'][pageid]['edittoken']
                 # FIXME use basetimestamp and starttimestamp
                 filename = os.path.join(self.metadir.root, file)