Changeset 56 for mergebot/trunk/utils


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

Mergebot: pair of bugfixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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.