[Buildbot-devel] git_buildbot too eager for merges

[Patrick Valsecchi]

Hi,

OK, here is the scenario I'm encountering. The initial situation is:

        master
          |
A--B--C--D
  \-E--F
       |
     dev

Everything is already pushed on the central git repository and Buildbot 
already tested every individual steps. I'm happy, everybody is happy.

Then I come and do a merge of the dev branch into master:

        master
          |
A--B--C--D--G
  \-E--F-----/
       |
     dev

The git_buildbot hook, as it is now in the buildbot repository (master 
branch) will trigger builds for the commits E, F and G. IMHO, it should 
not trigger commits for E and F since they are already tested and have 
not been pushed to the server.

Now, imagine there was 30 commits in the dev branch and each build takes 
an hour. See my problem?

In attachment, you'll find a proposed patch for that.

Thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Stop-doing-builds-for-merged-in-commits.patch
Type: text/x-diff
Size: 1241 bytes
Desc: not available
URL: <http://buildbot.net/pipermail/devel/attachments/20140408/3456c34b/attachment.bin>