Re: push patch for issue 2679
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? -- Phil Holmes - Original Message - From: David Nalesnik To: Lilypond Dev Sent: Tuesday, July 24, 2012 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 -- ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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. So, in this case, would I do something like: git pull -r then submit a new patch set? -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 created? Does this mean it needs rebasing, or somesuch? Likely. 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 merge conflicts. But any editor should do if you search for the merge conflict marks. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
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) for fixing the merge conflicts. But any editor should do if you search for the merge conflict marks. OK, I get the merge conflict. Is there any reason I can't manually remove the markers for the merge conflict, namely the lines: HEAD === Function for overriding broken spanners then continue on with the instructions I've been given: git rebase --continue ? (Please excuse my ignorance--working with git is quite new to me...) -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 instructions. Personally, I use Emacs and M-x smerge-ediff RET on the problematic file(s) for fixing the merge conflicts. But any editor should do if you search for the merge conflict marks. OK, I get the merge conflict. 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 changes on the same lines as you did. If both changes only added lines, the conflict mainly consists in making a decision which lines are to go first in the resulting file. then continue on with the instructions I've been given: git rebase --continue Likely. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
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 because the history introduced changes on the same lines as you did. If both changes only added lines, the conflict mainly consists in making a decision which lines are to go first in the resulting file. then continue on with the instructions I've been given: git rebase --continue Likely. 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... Thank you for your assistance. -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
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://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 author (assuming I remember). 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 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://lists.gnu.org/mailman/listinfo/lilypond-devel ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 update the author (assuming I remember). Is there a way of getting a formatted patch? David can run git format-patch origin and send you the resulting file. You can then apply that file using git checkout origin/staging git am [filename here] git push ... It would be advisable that both you and David check that his mail address in that file as well as the commit message make sense. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
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 the diff, then manually update the author (assuming I remember). Is there a way of getting a formatted patch? Don't apply things directly from Rietveld. Due to the problems that you discovered, we can only use it as a reviewing tool, not a patch management tool. David Nalesnik should send you the file he gets from git format-patch, after he fixed all merge conflicts etc. - Graham ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 addresses and formatting. This means to push stuff from Rietveld, I have to git apply the diff, then manually update the author (assuming I remember). Is there a way of getting a formatted patch? Don't apply things directly from Rietveld. Due to the problems that you discovered, we can only use it as a reviewing tool, not a patch management tool. David Nalesnik should send you the file he gets from git format-patch, after he fixed all merge conflicts etc. Arggh...sorry for making a hash of this :( Hopefully, this patch will be properly formatted... -David 0001-Function-for-overriding-broken-spanners.patch Description: Binary data ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 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 author (assuming I remember). Is there a way of getting a formatted patch? Don't apply things directly from Rietveld. Due to the problems that you discovered, we can only use it as a reviewing tool, not a patch management tool. David Nalesnik should send you the file he gets from git format-patch, after he fixed all merge conflicts etc. Arggh...sorry for making a hash of this :( Hopefully, this patch will be properly formatted... Yup. A matter of personal taste (you can do that just with git commit --amend): the commit message is [PATCH] Function for overriding broken spanners 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 of time. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 rest, thank you, but rather people continue explaining how to do the next step using the available tools. Sure, the tools are in a better shape than when I was showing myself to the ropes. But it took me much much longer. And frankly: I can't make the backend do the things you make them do in a reasonable amount of time. I am more like a car mechanic, and it is nice seeing somebody who actually manages to drive that thing. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 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 author (assuming I remember). Is there a way of getting a formatted patch? Don't apply things directly from Rietveld. Due to the problems that you discovered, we can only use it as a reviewing tool, not a patch management tool. David Nalesnik should send you the file he gets from git format-patch, after he fixed all merge conflicts etc. Arggh...sorry for making a hash of this :( Hopefully, this patch will be properly formatted... Yup. A matter of personal taste (you can do that just with git commit --amend): the commit message is [PATCH] Function for overriding broken spanners 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 of time. 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 make a new patch with the LilyDev interface. (It doesn't appear in nano.) I can, of course, just remove [PATCH] manually and save. -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 for issue 2679 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 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 author (assuming I remember). Is there a way of getting a formatted patch? Don't apply things directly from Rietveld. Due to the problems that you discovered, we can only use it as a reviewing tool, not a patch management tool. David Nalesnik should send you the file he gets from git format-patch, after he fixed all merge conflicts etc. Arggh...sorry for making a hash of this :( Hopefully, this patch will be properly formatted... -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 reason nobody pipes up and says I'll take it up from here and do all the rest, thank you, but rather people continue explaining how to do the next step using the available tools. Sure, the tools are in a better shape than when I was showing myself to the ropes. But it took me much much longer. And frankly: I can't make the backend do the things you make them do in a reasonable amount of time. I am more like a car mechanic, and it is nice seeing somebody who actually manages to drive that thing. Thank you--this means quite a lot to me! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 doing this! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
BTW - apologies for top-posting and that, but my Windows email system takes your mails as HTML and does this with them. Anyway - you're now in master. -- Phil Holmes - Original Message - From: David Nalesnik To: Phil Holmes Cc: Graham Percival ; David Kastrup ; lilypond-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 this! -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 automatically when I make a new patch with the LilyDev interface. (It doesn't appear in nano.) I can, of course, just remove [PATCH] manually and save. Sorry for the false alarm. I just remember that git format-patch adds that tag for the sake of posting such a patch or series to a mailing list, and so of course git am (apply mail or something like that) will remove it again anyhow. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 with code in it is better handled using ASCII, since my HTML formatter rather lavishly applies line breaks and unbreakable spaces and similar things. If the mail reader has an option sending text-only mails (no HTML), that will usually be the preferred form on mailing lists. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 Gnus (which I use as my mail reader) lets me choose. In general, anything with code in it is better handled using ASCII, since my HTML formatter rather lavishly applies line breaks and unbreakable spaces and similar things. If the mail reader has an option sending text-only mails (no HTML), that will usually be the preferred form on mailing lists. Gmail has an plain-text option (which I'm using now), so this message shouldn't contain any HTML. I'll make sure to use this with Lilypond correspondence from now on. -David ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: push patch for issue 2679
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 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 is better handled using ASCII, since my HTML formatter rather lavishly applies line breaks and unbreakable spaces and similar things. If the mail reader has an option sending text-only mails (no HTML), that will usually be the preferred form on mailing lists. Gmail has an plain-text option (which I'm using now), so this message shouldn't contain any HTML. I'll make sure to use this with Lilypond correspondence from now on. Looks fine here. -- David Kastrup ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
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 point of time. However, don't rely on the issue number too heavily. We've had requests not to have summaries like Fix issue 2679 since most people don't have all 3000 issues memorized, and somebody might be looking at the git history without an internet connection. (that's less often these days, but some trains or planes don't have wifi) It's fine to mention the issue number in the subject, but make sure the subject makes sense without the issue number as well. - Graham ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
