Thread (7 messages) flat view 7 messages, 4 authors, 2016-06-15

Re: Apply patch on server w/o git

From: Jan Hudec <hidden>
Date: 2016-06-15 22:44:25

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 [off-list ref]
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help