push patch for issue 2679

Hi, I don't have push ability, so would someone who does please push my patch for issue 2679 ("Add function for overriding broken spanners to LilyPond") for me? Thanks so much, David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.g

Re: push patch for issue 2679

2:31 PM Subject: push patch for issue 2679 Hi, I don't have push ability, so would someone who does please push my patch for issue 2679 ("Add function for overriding broken spanners to LilyPond") for me? Thanks s

Re: push patch for issue 2679

"Phil Holmes" writes: > I get the patch fails to apply - presumably because > music-functions.scm has been updated twice since the patch was > created?  Does this mean it needs rebasing, or somesuch? Likely. -- David Kastrup ___ lilypond-devel mail

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup wrote: > "Phil Holmes" writes: > > > I get the patch fails to apply - presumably because > > music-functions.scm has been updated twice since the patch was > > created? Does this mean it needs rebasing, or somesuch? > > Likely. So, in this case,

Re: push patch for issue 2679

David Nalesnik writes: > On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup wrote: > > "Phil Holmes" writes: > > > I get the patch fails to apply - presumably because > > music-functions.scm has been updated twice since the patch was > > created?  Does this mean it needs rebasi

Re: push patch for issue 2679

David, > > > > So, in this case, would I do something like: > > > > git pull -r > > > > then submit a new patch set? > > That's probably the easiest way. You'll likely get a merge conflict > with instructions. Personally, I use Emacs and > > M-x smerge-ediff RET > > on the problematic file(s) f

Re: push patch for issue 2679

David Nalesnik writes: > David, >   > > > > > > So, in this case, would I do something like: > > > > git pull -r > > > > then submit a new patch set? > > > That's probably the easiest way.  You'll likely get a merge > conflict > with instructions

Re: push patch for issue 2679

David, > > > Is there any reason I can't manually remove the markers for the merge > > conflict, namely the lines: > > > > <<< HEAD > > > > === > > > Function for overriding broken spanners > > If the result is the intended result, sure. You are getting the merge > conflict beca

Re: push patch for issue 2679

> OK, I succeeded in doing this and uploaded a new patch set. I'm going to > redo this now as I see I failed to delete two newlines... > > OK, all should be well now. Patch corrected. -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https:

Re: push patch for issue 2679

ember). Is there a way of getting a formatted patch? -- Phil Holmes - Original Message - From: David Nalesnik To: David Kastrup Cc: lilypond-devel@gnu.org Sent: Tuesday, July 24, 2012 5:18 PM Subject: Re: push patch for issue 2679 OK, I succeeded in doing this and upl

Re: push patch for issue 2679

"Phil Holmes" writes: > I'd be happy to push this, but would like a little advice.  If I go to > Rietveld and download the raw patch set, it comes without proper email > addresses and formatting.  This means to push stuff from Rietveld, I > have to git apply the diff, then manually update the aut

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote: > I'd be happy to push this, but would like a little advice. If I > go to Rietveld and download the raw patch set, it comes without > proper email addresses and formatting. This means to push stuff > from Rietveld, I have to git apply t

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival wrote: > On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote: > > I'd be happy to push this, but would like a little advice. If I > > go to Rietveld and download the raw patch set, it comes without > > proper email addresses and formatting

Re: push patch for issue 2679

David Nalesnik writes: > On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival > wrote: > > On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote: > > I'd be happy to push this, but would like a little advice.  If I > > go to Rietveld and download the raw patch set, it comes withou

Re: push patch for issue 2679

David Nalesnik writes: > Arggh...sorry for making a hash of this :( By the way, you aren't. You are dealing with flexible and powerful tools in action, and keeping up surprisingly well. That's the reason nobody pipes up and says "I'll take it up from here and do all the rest, thank you", but r

Re: push patch for issue 2679

David, On Tue, Jul 24, 2012 at 11:50 AM, David Kastrup wrote: > David Nalesnik writes: > > > On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival > > wrote: > > > > On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote: > > > I'd be happy to push this, but would like a little advice

Re: push patch for issue 2679

for issue 2679 On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival wrote: On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote: > I'd be happy to push this, but would like a little advice. If I > go to Rietveld and download the raw patch set, it comes without

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 12:05 PM, David Kastrup wrote: > David Nalesnik writes: > > > Arggh...sorry for making a hash of this :( > > By the way, you aren't. You are dealing with flexible and powerful > tools in action, and keeping up surprisingly well. That's the reason > nobody pipes up and s

Re: push patch for issue 2679

Phil, On Tue, Jul 24, 2012 at 12:07 PM, Phil Holmes wrote: > ** > Pushed as > f7085cf9b2ff111b7d30c8a59e367c771a7e3c52. > Patchy is now running. > Thank you very much for doing this! -

Re: push patch for issue 2679

ypond-devel@gnu.org Sent: Tuesday, July 24, 2012 6:10 PM Subject: Re: push patch for issue 2679 Phil, On Tue, Jul 24, 2012 at 12:07 PM, Phil Holmes wrote: Pushed as f7085cf9b2ff111b7d30c8a59e367c771a7e3c52. Patchy is now running. Thank you very much for doing this! -

Re: push patch for issue 2679

David Nalesnik writes: > I just tried to change the commit message as you said.  When I check > the amended patch, however, the subject line at the top of the file > is: > > Subject: [PATCH] Issue 2679: Function for overriding broken spanners > > Apparently, [PATCH] is added automatically when I

Re: push patch for issue 2679

"Phil Holmes" writes: > BTW - apologies for top-posting and that, but my Windows email system > takes your mails as HTML and does this with them. His mails contain HTML and plain text as alternatives, and Gnus (which I use as my mail reader) lets me choose. In general, anything with code in it

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 12:57 PM, David Kastrup wrote: > > "Phil Holmes" writes: > > > BTW - apologies for top-posting and that, but my Windows email system > > takes your mails as HTML and does this with them. > > His mails contain HTML and plain text as alternatives, and Gnus (which I > use as

Re: push patch for issue 2679

David Nalesnik writes: > On Tue, Jul 24, 2012 at 12:57 PM, David Kastrup wrote: >> >> "Phil Holmes" writes: >> >> > BTW - apologies for top-posting and that, but my Windows email system >> > takes your mails as HTML and does this with them. >> >> His mails contain HTML and plain text as alterna

Re: push patch for issue 2679

On Tue, Jul 24, 2012 at 06:50:52PM +0200, David Kastrup wrote: > We don't commit anything other than patches. That's redundant. But > > Issue 2679: Function for overriding broken spanners > > would make it easier to find the corresponding issue in case one needs > to revisit the commit at one p