Add batched merge (rollup) feature - #46
Conversation
Checking if the user is one of the reviewers is already done when retrieving the head comments.
271146f to
a1d4f5eComparebarosl
commented
Dec 12, 2014
You can see the working sample from here: barosltestest/test#49 |
barosl
commented
Dec 12, 2014
By defaults, bors checks the freshness of the merge commit before fast-forwarding it to As a batched merge commit does not have |
5807cf4 to
f57c6ccCompareCurrently it works as follows: 1. Mark the commits to be merged together as rollup. (e.g. r+ rollup) These commits will have an implicit priority of -1 to postpone the individual merge. 2. If one of the marked commits reaches the top of the queue, all the marked commits will be merged together and tested. 3. While merging commits, those commits that fail to merge are ignored. 4. You can prioritize the rollup by setting p=. Typical usage: 1. We have three commits to be tested together. 2. Set r+ rollup to the first commit. 3. Set r+ rollup to the second commit. 4. Set r+ rollup p=10 to the last commit, which will trigger the rollup process soon. Fixesgraydon#34.
Gankra
commented
Dec 12, 2014
In order for the Rust project to take advantage of this, it would need to be based on the |
Currently it works as follows:
rollup. (e.g.r+ rollup)These commits will have an implicit priority of
-1to postpone the individual merge.p=.Typical usage:
r+ rollupto the first commit.r+ rollupto the second commit.r+ rollup p=10to the last commit, which will trigger the rollup process soon.Fixes#34.