Changes from mergebot/trunk/mergebot/SvnOps.py at r16 to mergebot/branches/ticket-1/mergebot/SvnOps.py at r22

File:

• mergebot/branches/ticket-1/mergebot/SvnOps.py (modified) (2 diffs)

mergebot/branches/ticket-1/mergebot/SvnOps.py

@@ -69 +69 @@
     skipped_regex = re.compile("Skipped.* '(.*)'", re.M)
     start_rev, end_rev = revision_range
-    pipe = os.popen("cd %s && svn merge --revision %s:%s %s . 2>>%s" % \
+    pipe = os.popen("cd %s && svn merge --non-interactive --revision %s:%s %s . 2>>%s" % \
         (workingdir, start_rev, end_rev, from_url, logfile))
     output = pipe.readlines()
@@ -79 +79 @@
             filename = skipped_regex.findall(line)[0]
             status = "C"
+        elif line.startswith('--- Merging '):
+            continue # ignore this line for now
+        elif line.startswith('Summary of conflicts:'):
+            continue # ignore this line for now
+        elif line.startswith('  Text conflicts:'):
+            continue # ignore this line for now
         else:
             assert line[4] == ' ', "Unexpected output from svn merge " \