Re: rebasing inside staging

2011-11-30 Thread Keith OHara
On Wed, 30 Nov 2011 01:38:22 -0800, Adam Spiers wrote: On Wed, Nov 30, 2011 at 7:28 AM, Keith OHara wrote: Adam Spiers adamspiers.org> writes: Fixed patch series is now in staging. I am now seeing trouble with 'chord-name-exceptions.ly' and similar. The slash missing in the markup for th

Re: rebasing inside staging

2011-11-30 Thread Adam Spiers
On Wed, Nov 30, 2011 at 7:28 AM, Keith OHara wrote: > Adam Spiers adamspiers.org> writes: >> Fixed patch series is now in staging. > > I am now seeing trouble with 'chord-name-exceptions.ly' and similar. > The slash missing in the markup for the \chordmode { c:7sus4 }. That's one of the intended

Re: rebasing inside staging

2011-11-29 Thread Keith OHara
Adam Spiers adamspiers.org> writes: > Fixed patch series is now in staging. > I am now seeing trouble with 'chord-name-exceptions.ly' and similar. The slash missing in the markup for the \chordmode { c:7sus4 }. ___ lilypond-devel mailing list lilypo

Re: rebasing inside staging

2011-11-29 Thread Adam Spiers
On Tue, Nov 29, 2011 at 11:10 AM, Adam Spiers wrote: > I'm building a fixed version > of the patch series as I type this, and will push as soon as I'm > convinced it's good, in order to minimise the risk of someone else > accidentally pushing the old series back in. Fixed patch series is now in s

Re: rebasing inside staging

2011-11-29 Thread Adam Spiers
ARGH. My bad :-( Really sorry guys. It's very simple what happened, and in fact you already know most of it: - There was a long period of time in between the completion of the review and pushing to staging, due to my misunderstanding of the development process (which I will partially

Re: rebasing inside staging

2011-11-28 Thread Graham Percival
On Tue, Nov 29, 2011 at 04:09:48AM +0100, David Kastrup wrote: > I backed out all of the jazz chord changes. Since they were last in > staging, this did not actually require a rebase. This should likely be > pretty painless. It does have the disadvantage that anybody who already > fetched them c

Re: rebasing inside staging

2011-11-28 Thread David Kastrup
Graham Percival writes: > On Tue, Nov 29, 2011 at 03:41:25AM +0100, David Kastrup wrote: > >> An interesting question is how the commit could >> a) acquire changes not at all described in the commit message > > eh? The description seems legit here. At least, I assume that > changing \super to \

Re: rebasing inside staging

2011-11-28 Thread David Kastrup
Graham Percival writes: > On Tue, Nov 29, 2011 at 03:41:25AM +0100, David Kastrup wrote: >> Graham Percival writes: >> >> > 2) remove that commit, then rebase origin/staging on the result. >> > >> > I'm not comfortable rewriting history on a shared repository. >> >> I'll do the second one. Re

Re: rebasing inside staging

2011-11-28 Thread Graham Percival
On Tue, Nov 29, 2011 at 03:41:25AM +0100, David Kastrup wrote: > Graham Percival writes: > > > 2) remove that commit, then rebase origin/staging on the result. > > > > I'm not comfortable rewriting history on a shared repository. > > I'll do the second one. Rewriting history is easy, and that i

Re: rebasing inside staging

2011-11-28 Thread David Kastrup
Graham Percival writes: > Compile of staging dies due to: > > > baf650c616cf73ab8ee47e28b298f7d7e1336867 > Author: Adam Spiers 2011-07-28 00:51:12 > Committer: Adam Spiers 2011-11-28 > 09:31:44 > Parent: c8e6f4dbdbe2932504aa294394862728cff0ba5c (Replace tabs > with spaces in scm/chord-ignatze

rebasing inside staging

2011-11-28 Thread Graham Percival
Compile of staging dies due to: baf650c616cf73ab8ee47e28b298f7d7e1336867 Author: Adam Spiers 2011-07-28 00:51:12 Committer: Adam Spiers 2011-11-28 09:31:44 Parent: c8e6f4dbdbe2932504aa294394862728cff0ba5c (Replace tabs with spaces in scm/chord-ignatzek-names.scm) Child: baf650c616cf73ab8ee47