Re: Bisection/merge commits (was: PATCH: Countdown to 20111027)

2011-10-26 Thread Graham Percival
On Thu, Oct 27, 2011 at 07:36:23AM +0200, David Kastrup wrote: > Can you figure out what steps you did for pushing staging to master, > perhaps using the reflog or other personal history? I made sure that I > had a merge commit in staging for doing the tuning work. I copied&pasted from a previous

Bisection/merge commits (was: PATCH: Countdown to 20111027)

2011-10-26 Thread David Kastrup
Graham Percival writes: > On Wed, Oct 26, 2011 at 03:55:13PM +0200, David Kastrup wrote: >> Graham Percival 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 t

Re: PATCH: Countdown to 20111027

2011-10-26 Thread Graham Percival
On Wed, Oct 26, 2011 at 03:55:13PM +0200, David Kastrup wrote: > Graham Percival 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

Re: PATCH: Countdown to 20111027

2011-10-26 Thread David Kastrup
Graham Percival 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 an

Re: PATCH: Countdown to 20111027

2011-10-26 Thread Graham Percival
On Wed, Oct 26, 2011 at 07:04:48AM -0600, Colin Campbell wrote: > Procedurally, I gather that the patch meister doesn't really care > whether a patch is on /staging or /master, only that Patchy has > checked it, and that there are no howls of protest in the discussion > on Rietveld or the various l

Re: PATCH: Countdown to 20111027

2011-10-26 Thread David Kastrup
Colin Campbell writes: > A couple of points for clarity, then: > > Procedurally, I gather that the patch meister doesn't really care > whether a patch is on /staging or /master, only that Patchy has > checked it, and that there are no howls of protest in the discussion > on Rietveld or the variou

Re: PATCH: Countdown to 20111027

2011-10-26 Thread Colin Campbell
On 11-10-25 11:04 PM, Graham Percival wrote: On Wed, Oct 26, 2011 at 06:26:01AM +0200, m...@apollinemike.com wrote: Procedural question - fixes for 1990 and 1992 are in dev/staging and may or may not be in master (I haven't checked yet this morning). If they're in staging, then that mea

Re: PATCH: Countdown to 20111027

2011-10-25 Thread Graham Percival
On Wed, Oct 26, 2011 at 06:26:01AM +0200, m...@apollinemike.com wrote: >Procedural question - fixes for 1990 and 1992 are in dev/staging and may >or may not be in master (I haven't checked yet this morning). If they're in staging, then that means that you want them pushed immediately. The

Re: PATCH: Countdown to 20111027

2011-10-25 Thread m...@apollinemike.com
On Oct 26, 2011, at 6:20 AM, Colin Campbell wrote: > For 23:00 MDT Thursday October 27 > > Issue 1980: Patch: Sketch for in-notes. - R 5293053 > > Issue 1981: Patch: Adds Scheme function for spring constructor. - R 5306050 > > Issue 1989: Patch: Website: use external $LILYPOND_WEB_MEDIA_GIT - R

PATCH: Countdown to 20111027

2011-10-25 Thread Colin Campbell
For 23:00 MDT Thursday October 27 Issue 1980 : Patch: Sketch for in-notes. - R5293053 Issue 1981 : Patch: Adds Scheme function for spring