Re: PATCH: Countdown to 20111027

[Graham Percival]

On Wed, Oct 26, 2011 at 03:55:13PM +0200, David Kastrup wrote:
> Graham Percival <address@hidden> writes:
> 
> > that is a concern, but I have no energy left to be concerned about it.
> > Note that merging from dev/staging to master will be completely
> > automatic (including the tests to determine if this is safe).
> 
> It can't always be automatic if parallel pushes to master happened and
> staging needs to get rebased first (else pushing will not be
> permissible, and testing is point of moot).  Some rebases don't go
> through without manual intervention.

If that happens, then we have a wailing and gnashing of teeth and
somebody does it manually.  So rewrite that previous sentence as
"as long as the tests determine that merging is safe, the merging
is completely automatic; if anything goes wrong, there is a
wailing and gnashing of teeth and somebody needs to shovel the
garbage by hand".

- Graham