git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Apply patch on server w/o git

From
JHJan Hudec <bulb@ucw.cz>
Date
Mar 25, 2008, 19:46 UTC
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 <bulb@ucw.cz>
Previous: Joe FioriniNext: Robin Rosenberg
Message 4 of 7 in “Apply patch on server w/o git”
  1. Joe FioriniMar 25, 2008
  2. Bryan DonlanMar 25, 2008
  3. Joe FioriniMar 25, 2008
  4. Jan HudecMar 25, 2008
  5. Robin RosenbergMar 25, 2008
  6. Joe FioriniMar 26, 2008
  7. Jan HudecMar 29, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.