Changeset 22
- Timestamp:
- Sep 19, 2009 3:40:09 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
mergebot/branches/ticket-1/mergebot/SvnOps.py
r16 r22 69 69 skipped_regex = re.compile("Skipped.* '(.*)'", re.M) 70 70 start_rev, end_rev = revision_range 71 pipe = os.popen("cd %s && svn merge -- revision %s:%s %s . 2>>%s" % \71 pipe = os.popen("cd %s && svn merge --non-interactive --revision %s:%s %s . 2>>%s" % \ 72 72 (workingdir, start_rev, end_rev, from_url, logfile)) 73 73 output = pipe.readlines() … … 79 79 filename = skipped_regex.findall(line)[0] 80 80 status = "C" 81 elif line.startswith('--- Merging '): 82 continue # ignore this line for now 83 elif line.startswith('Summary of conflicts:'): 84 continue # ignore this line for now 85 elif line.startswith(' Text conflicts:'): 86 continue # ignore this line for now 81 87 else: 82 88 assert line[4] == ' ', "Unexpected output from svn merge " \
Note: See TracChangeset
for help on using the changeset viewer.