From: Jan Hudec Date: Tue, 25 Mar 2008 19:46:31 GMT Subject: Re: Apply patch on server w/o git Message-ID: <20080325194631.GD4857@efreet.light.src> In-Reply-To: <3e8340490803251141x6d199d8ch8828b396da202d81@mail.gmail.com> On Tue, Mar 25, 2008 at 14:41:04 -0400, Bryan Donlan wrote: > Just a guess, but the gnuwin32 tools might not like unix line endings. > Try opening and re-saving in wordpad (or vim :set ff=dos, or $insert > your favorite method here). That won't actually work! The problem is, that: - The headers (+++/---/@@ lines) should have dos line endings (but does not matter too much). - The bodies must have the same line endings the actual code does. Question is, what the code has (it could have been transfered by some method that converted the line-endings or something). Also trying to patch with ignoring whitespace could work (I believe I did that the other way 'round -- applying windowsy newline-damaged patch on unix). And if it does not, it's not the newlines problem. -- Jan 'Bulb' Hudec