On Fri, Mar 7, 2014 at 12:37 PM, C. Scott Ananian <cananian(a)wikimedia.org>wrote;wrote:
The benefit of halting auto-merge is that (a) it
automatically resumes
once the deploy happens, so volunteers don't have to come back to gerrit to
repeat their approval,
Unless it merge-conflicts now where it didn't 24 hours ago.
and (b) gerrit already has a convenient "publish
and submit" button that
can be used to easily merge deployment-relevant patches before the branch
is cut.
Which skips Jenkins running the unit tests.
Also, I believe it's possible to disable "publish and submit" in Gerrit; I
think VE and UploadWizard do this, for example.
--
Brad Jorsch (Anomie)
Software Engineer
Wikimedia Foundation