[Wikitech-l] When to automerge (Re: Revoking +2 (Re: who can merge into core/master?))

2013-02-15 Thread Platonides
On 15/02/13 01:38, Brad Jorsch wrote: I'd propose one more: * Someone else gives +2, but Jenkins rejects it because it needs a rebase that is not quite trivial enough for it to do it automatically. For example, something in RELEASE-NOTES-1.21. Seems a better example. I'm not convinced that

Re: [Wikitech-l] When to automerge (Re: Revoking +2 (Re: who can merge into core/master?))

2013-02-15 Thread Krinkle
On Feb 15, 2013, at 3:32 PM, Platonides platoni...@gmail.com wrote: I'm not convinced that backporting should be automatically merged, though. Even if the code at REL-old is the same as master (ie. the backport doesn't needs any code change), approving something from master is different than

Re: [Wikitech-l] When to automerge (Re: Revoking +2 (Re: who can merge into core/master?))

2013-02-15 Thread Chris Steipp
On Fri, Feb 15, 2013 at 6:32 AM, Platonides platoni...@gmail.com wrote: On 15/02/13 01:38, Brad Jorsch wrote: I'd propose one more: * Someone else gives +2, but Jenkins rejects it because it needs a rebase that is not quite trivial enough for it to do it automatically. For example, something

Re: [Wikitech-l] When to automerge (Re: Revoking +2 (Re: who can merge into core/master?))

2013-02-15 Thread Platonides
On 15/02/13 18:51, Chris Steipp wrote: This process is painful (no one like reviewing patches in bugzilla), and the wrangling to get the right people to review patches in bugzilla is slowing down our security releases. It would be much better if we had a way to submit the patches in gerrit, go