Changeset 22


Ignore:
Timestamp:
Sep 19, 2009 3:40:09 PM (15 years ago)
Author:
retracile
Message:

Ticket #1: ad-hoc parsing of new merge and merge conflict output, but I believe this is incomplete

File:
1 edited

Legend:

Unmodified
Added
Removed
  • mergebot/branches/ticket-1/mergebot/SvnOps.py

    r16 r22  
    6969    skipped_regex = re.compile("Skipped.* '(.*)'", re.M)
    7070    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" % \
    7272        (workingdir, start_rev, end_rev, from_url, logfile))
    7373    output = pipe.readlines()
     
    7979            filename = skipped_regex.findall(line)[0]
    8080            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
    8187        else:
    8288            assert line[4] == ' ', "Unexpected output from svn merge " \
Note: See TracChangeset for help on using the changeset viewer.