Changeset 29


Ignore:
Timestamp:
Nov 2, 2009 4:58:17 PM (15 years ago)
Author:
retracile
Message:

When conflicts occur on rebranch, treat that as a failure

Location:
mergebot/trunk/mergebot
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • mergebot/trunk/mergebot/BranchActor.py

    r24 r29  
    5151            comment = 'Failed to create branch.'
    5252            return results, comment, False
     53
    5354        results['mergebotstate'] = 'branched'
    5455        comment = '\n'.join([

  • mergebot/trunk/mergebot/RebranchActor.py

    r24 r29  
    126126                    "commit your work to the branch.",
    127127            ])
     128            success = False # the rebranch failed because there were conflicts
    128129        else: # No conflicts, do the commit.
    129130            mergemessage = "\n".join([
Note: See TracChangeset for help on using the changeset viewer.