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

Re: [PATCH] make file merging respect permissions

From
JBJames Bottomley <james.bottomley@steeleye.com>
Date
Apr 24, 2005, 12:46 UTC
Message-ID
<1114346767.4997.2.camel@mulgrave>
In-Reply-To
<Pine.LNX.4.58.0504232153500.15879@ppc970.osdl.org>
On Sat, 2005-04-23 at 21:55 -0700, Linus Torvalds wrote:
> Well, I actually ended up editing the line numbers manually and already 
> pushed out the previous one, so you might want to double-check that my 
> current tree matches yours.

Just to get closure on this, I went over all the parts of patch generation, and the culprit turns out to be emacs. Apparently its diff mode (which I never thought to investigate how to use) does these re- writes ... no idea why, but the problem goes away if I strip out the extraneous pieces in fundamental-mode. It's never given me this trouble before ... I think the diff I'm producing must be confusing it somehow.

James
Previous: Andreas Gal
Message 14 of 14 in “make file merging respect permissions”
  1. make file merging respect permissionsJames Bottomley, Apr 23, 2005
  2. Linus TorvaldsApr 23, 2005
  3. James BottomleyApr 23, 2005
  4. James BottomleyApr 23, 2005
  5. Petr BaudisApr 23, 2005
  6. James BottomleyApr 23, 2005
  7. James BottomleyApr 23, 2005
  8. Linus TorvaldsApr 24, 2005
  9. James BottomleyApr 24, 2005
  10. Linus TorvaldsApr 24, 2005
  11. James BottomleyApr 24, 2005
  12. [PATH] fix segfault in fsck-cacheAndreas Gal, Apr 24, 2005
  13. Andreas GalApr 24, 2005
  14. James BottomleyApr 24, 2005

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.