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
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 so much,
David
Phil Holmes m...@philholmes.net 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
___
On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup d...@gnu.org wrote:
Phil Holmes m...@philholmes.net 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 Nalesnik david.nales...@gmail.com writes:
On Tue, Jul 24, 2012 at 8:56 AM, David Kastrup d...@gnu.org wrote:
Phil Holmes m...@philholmes.net writes:
I get the patch fails to apply - presumably because
music-functions.scm has been updated twice since the patch was
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) for fixing the
David Nalesnik david.nales...@gmail.com 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
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 because the history introduced
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
). 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 uploaded
Phil Holmes m...@philholmes.net 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
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 the
On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival
gra...@percival-music.cawrote:
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
David Nalesnik david.nales...@gmail.com writes:
On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival
gra...@percival-music.ca 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
David Nalesnik david.nales...@gmail.com 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
David,
On Tue, Jul 24, 2012 at 11:50 AM, David Kastrup d...@gnu.org wrote:
David Nalesnik david.nales...@gmail.com writes:
On Tue, Jul 24, 2012 at 11:34 AM, Graham Percival
gra...@percival-music.ca wrote:
On Tue, Jul 24, 2012 at 05:26:01PM +0100, Phil Holmes wrote:
I'd be
Pushed as f7085cf9b2ff111b7d30c8a59e367c771a7e3c52. Patchy is now running.
--
Phil Holmes
- Original Message -
From: David Nalesnik
To: Graham Percival
Cc: Phil Holmes ; David Kastrup ; lilypond-devel@gnu.org
Sent: Tuesday, July 24, 2012 5:37 PM
Subject: Re: push patch
On Tue, Jul 24, 2012 at 12:05 PM, David Kastrup d...@gnu.org wrote:
David Nalesnik david.nales...@gmail.com 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
Phil,
On Tue, Jul 24, 2012 at 12:07 PM, Phil Holmes m...@philholmes.net wrote:
**
Pushed as
f7085cf9b2ff111b7d30c8a59e367c771a7e3c52http://git.savannah.gnu.org/cgit/lilypond.git/commit/?h=stagingid=f7085cf9b2ff111b7d30c8a59e367c771a7e3c52.
Patchy is now running.
Thank you very much for
-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 m...@philholmes.net wrote:
Pushed as f7085cf9b2ff111b7d30c8a59e367c771a7e3c52. Patchy is now running.
Thank you very much for doing
David Nalesnik david.nales...@gmail.com 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
Phil Holmes m...@philholmes.net 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
On Tue, Jul 24, 2012 at 12:57 PM, David Kastrup d...@gnu.org wrote:
Phil Holmes m...@philholmes.net 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
David Nalesnik david.nales...@gmail.com writes:
On Tue, Jul 24, 2012 at 12:57 PM, David Kastrup d...@gnu.org wrote:
Phil Holmes m...@philholmes.net 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
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 point
25 matches
Mail list logo
