[Buildbot-devel] Merging of build requests

[Kay Hayen]

Hello,

I would like to avoid merging of build requests, when one is a fast forward
of the other, which happens frequently in my git flow. I push master and
develop at the same time, and it appears they feed "develop" in what ought
to receive "master" build results.

So, I came up with this:

def mergeRequests(builder, req1, req2):
    "any requests with the same branch can be merged"
    return req1.branch == req2.branch and req1.canBeMergedWith(req2)

c['mergeRequests'] = mergeRequests

Can you tell me, if tthat is the proper way of attempting to amend the
default merging behavior?

Yours,
Kay Hayen
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://buildbot.net/pipermail/devel/attachments/20140424/cdf315a4/attachment.html>