Changeset 56


Ignore:
Timestamp:
Feb 23, 2010 7:56:07 PM (15 years ago)
Author:
retracile
Message:

Mergebot: pair of bugfixes

Location:
mergebot/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • mergebot/trunk/mergebot/svn.py

    r55 r56  
    158158                    "from svn merge operation; the 5th character should " \
    159159                    "always be a space.  Invalid output line was %r.\nFull output was: %r." % (line, output)
    160                 filename = line[5:-1] # (strip trailing newline)
     160                filename = line[5:]
    161161                status = line[:4].rstrip()
    162162            results.append((status, filename))
  • mergebot/trunk/utils/test.py

    r54 r56  
    112112        tc.find('CheckMerge')
    113113        self.go_to_ticket(ticket_id)
    114         tc.find('Rebranched from .* for .*')
     114        tc.find('(Rebranched from .* for .*|There were conflicts on rebranching)')
    115115        retval = call(['svn', 'ls', self.repo_url + '/' + component + '/branches/ticket-%s' % ticket_id],
    116116                    stdout=logfile, stderr=logfile)
Note: See TracChangeset for help on using the changeset viewer.