[Buildbot-commits] [Buildbot] #2025: If global and/or per builder mergeRequests is not set, the default mergeRequests handler expects only two arguments not the provided 3

[Buildbot]

#2025: If global and/or per builder mergeRequests is not set, the default
mergeRequests handler expects only two arguments not the provided 3
---------------------+---------------------
Reporter:  bdbaddog  |       Owner:
    Type:  defect    |      Status:  closed
Priority:  blocker   |   Milestone:  0.8.5
 Version:  0.8.4p1   |  Resolution:  fixed
Keywords:            |
---------------------+---------------------

Comment (by Dustin J. Mitchell):

 Use a properly-formed default mergeRequests function

 This function takes the requisite three arguments (builder, req1, req2),
 and calls through to the BuildRequest.canBeMergedWith method.

 Fixes #2025.
  Changeset: 78bea192df2fa04472181e4de030785545d6ffbd

-- 
Ticket URL: <http://trac.buildbot.net/ticket/2025#comment:2>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation