Re: Git patch won't apply

Johannes Schindelin wrote Monday, January 12, 2009 12:45 PM On Mon, 12 Jan 2009, Trevor Daniels wrote: Valentin Villenave wrote Sunday, January 11, 2009 6:30 PM > By the way, one sensible addition to the CG might be to invite Windows > users to do > > git config global.autocrlf = false > > o

Re: Git patch won't apply

Hi, On Mon, 12 Jan 2009, Trevor Daniels wrote: > Valentin Villenave wrote Sunday, January 11, 2009 6:30 PM > > > By the way, one sensible addition to the CG might be to invite Windows > > users to do > > > > git config global.autocrlf = false > > > > or something like that (by default under Wi

Re: Git patch won't apply

Valentin Villenave wrote Monday, January 12, 2009 10:05 AM 2009/1/12 Trevor Daniels : Why should you want to turn this off, Valentin? Because a) any decent editor (i.e. other than NotePad) recognizes and knows how to edit LF EOL-ed documents b) my opera (and I believe that Lily's source co

Re: Git patch won't apply

2009/1/12 Trevor Daniels : > Why should you want to turn this off, Valentin? Because a) any decent editor (i.e. other than NotePad) recognizes and knows how to edit LF EOL-ed documents b) my opera (and I believe that Lily's source code does too) uses only LF endings c) so whenever I modified a fi

Re: Git patch won't apply

Valentin Villenave wrote Sunday, January 11, 2009 6:30 PM By the way, one sensible addition to the CG might be to invite Windows users to do git config global.autocrlf = false or something like that (by default under Windows, git converts all line endings to crlf) I'm not sure this is advis

Re: Git patch won't apply

Hi, On Sun, 11 Jan 2009, Valentin Villenave wrote: > 2009/1/11 Johannes Schindelin : > > > The next Windows Git installer will let the user choose which strategy > > to take. > > Great! You have no idea how much hair I have been pulling out about this > :-) Actually, I do, that's why I force

Re: Git patch won't apply

2009/1/11 Johannes Schindelin : > The next Windows Git installer will let the user choose which strategy to > take. Great! You have no idea how much hair I have been pulling out about this :-) Cheers, Valentin ___ lilypond-devel mailing list lilypond

Re: Git patch won't apply

Hi, On Sun, 11 Jan 2009, Valentin Villenave wrote: > 2009/1/10 Graham Percival : > > > CG! CG! CG! :) > > By the way, one sensible addition to the CG might be to invite Windows > users to do > > git config global.autocrlf = false > > or something like that (by default under Windows, git conv

Re: Git patch won't apply

2009/1/10 Graham Percival : > CG! CG! CG! :) By the way, one sensible addition to the CG might be to invite Windows users to do git config global.autocrlf = false or something like that (by default under Windows, git converts all line endings to crlf) Cheers, Valentin __

Re: Git patch won't apply

On Sat, Jan 10, 2009 at 06:30:23PM +0100, John Mandereau wrote: > Neil Puttock a écrit : >>> Any thoughts on what is wrong or how I can get this patch to apply? >> >> It applies OK using `git am'. > > BTW git-apply should be used for patches without authoring information, > i.e. patches not made w

Re: Git patch won't apply

On Sat, Jan 10, 2009 at 11:40 AM, Reinhold Kainhofer wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Am Samstag, 10. Januar 2009 20:27:34 schrieb Carl D. Sorensen: >> On 1/10/09 12:16 PM, "Reinhold Kainhofer" wrote: >> > Can you maybe attach the file (rather than pasting its contents

Re: Git patch won't apply

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am Samstag, 10. Januar 2009 20:27:34 schrieb Carl D. Sorensen: > On 1/10/09 12:16 PM, "Reinhold Kainhofer" wrote: > > Can you maybe attach the file (rather than pasting its contents into the > > mail), so that end-of-line characters are preserved... >

Re: Git patch won't apply

On 1/10/09 12:16 PM, "Reinhold Kainhofer" wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA1 > > Am Samstag, 10. Januar 2009 19:29:31 schrieb Carl D. Sorensen: >> On 1/10/09 11:24 AM, "John Mandereau" wrote: >>> Carl D. Sorensen a écrit : > Are "diff --git a/... b/..." lines broken

Re: Git patch won't apply

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am Samstag, 10. Januar 2009 19:29:31 schrieb Carl D. Sorensen: > On 1/10/09 11:24 AM, "John Mandereau" wrote: > > Carl D. Sorensen a écrit : > >>> Are "diff --git a/... b/..." lines broken in the patch you actually > >>> tried to apply? They should n

Re: Git patch won't apply

On 1/10/09 11:24 AM, "John Mandereau" wrote: > Carl D. Sorensen a écrit : >>> Are "diff --git a/... b/..." lines broken in the patch you actually tried to >>> apply? They should not be broken, I guess. >> >> No, they're not broken. It's one line. > > Ugh, I'm almost short of ideas; which O

Re: Git patch won't apply

Carl D. Sorensen a écrit : Are "diff --git a/... b/..." lines broken in the patch you actually tried to apply? They should not be broken, I guess. No, they're not broken. It's one line. Ugh, I'm almost short of ideas; which OS do you use to work with Git? Could a non-Linux system be confu

Re: Git patch won't apply

On 1/10/09 10:54 AM, "John Mandereau" wrote: >>> Carl D. Sorensen a écrit : fatal: git apply: bad git-diff - expected /dev/null on line 46 Patch failed at 0001. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run

Re: Git patch won't apply

Carl D. Sorensen a écrit : fatal: git apply: bad git-diff - expected /dev/null on line 46 Patch failed at 0001. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "g

Re: Git patch won't apply

On 1/10/09 10:40 AM, "John Mandereau" wrote: > Carl D. Sorensen a écrit : >> fatal: git apply: bad git-diff - expected /dev/null on line 46 >> Patch failed at 0001. >> When you have resolved this problem run "git am --resolved". >> If you would prefer to skip this patch, instead run "git am --

Re: Git patch won't apply

Carl D. Sorensen a écrit : fatal: git apply: bad git-diff - expected /dev/null on line 46 Patch failed at 0001. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "g

Re: Git patch won't apply

On 1/10/09 10:22 AM, "Neil Puttock" wrote: > Hi Carl, > > 2009/1/10 Carl D. Sorensen : > >> Any thoughts on what is wrong or how I can get this patch to apply? > > It applies OK using `git am'. Thanks for the tip. I hadn't known about git am. But it still didn't apply properly for me:

Re: Git patch won't apply

Neil Puttock a écrit : Hi Carl, 2009/1/10 Carl D. Sorensen : Any thoughts on what is wrong or how I can get this patch to apply? It applies OK using `git am'. BTW git-apply should be used for patches without authoring information, i.e. patches not made with git-format-patch. Cheers, Joh

Re: Git patch won't apply

Hi Carl, 2009/1/10 Carl D. Sorensen : > Any thoughts on what is wrong or how I can get this patch to apply? It applies OK using `git am'. Cheers, Neil ___ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilyp

Git patch won't apply

I received the following patch from Patrick McCarty;; From 61917179406f567351d73282ca4ed008b3e4b859 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 6 Jan 2009 16:26:22 -0800 Subject: [PATCH] Docs: Add new procedure for barNumberVisibility * The default value of barNumberVisibility, the