[Buildbot-devel] Merging of build requests

[Vasily]

Hello Kay,

If you want to skip the merging altogether it should be enough to just set
c['mergeRequests'] = False
If you still want to merge same branch requests your code seems okay (given
it works).

Thanks,
Vasily


2014-04-24 23:38 GMT+04:00 Kay Hayen <kay.hayen at gmail.com>:

> 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
>
>
>
> ------------------------------------------------------------------------------
> Start Your Social Network Today - Download eXo Platform
> Build your Enterprise Intranet with eXo Platform Software
> Java Based Open Source Intranet - Social, Extensible, Cloud Ready
> Get Started Now And Turn Your Intranet Into A Collaboration Platform
> http://p.sf.net/sfu/ExoPlatform
> _______________________________________________
> Buildbot-devel mailing list
> Buildbot-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/buildbot-devel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://buildbot.net/pipermail/devel/attachments/20140424/a7a2f029/attachment.html>