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

Re: Moved files and merges

From
HAH. Peter Anvin <hpa@zytor.com>
Date
Sep 5, 2005, 16:37 UTC
Message-ID
<431C7456.80907@zytor.com>
In-Reply-To
<Pine.LNX.4.58.0509050825170.3568@evo.osdl.org>
Linus Torvalds wrote:
Show 24 quoted lines
> 
> It's a totally broken model. Really.
> 
> You think it solves issues, but it just creates more bugs and problems 
> than it solves.
> 
> Trust me. The whole point of git is that "content is the only thing that 
> matters", and that there isn't any other meta-data. If you break that 
> fundamental assumption, everything git does so well will break. 
> 
> I think we've already shown that the "content matters" approach works.  I
> claim that the git rename tracking works better than any other SCM out 
> there, _exactly_ because it doesn't make the mistake of trying to track 
> anything but content.
> 
> The "moved + modified files" is not anything special. The current 
> automatic merger may not handle it, but that's not because it _can't_ 
> handle it, it's because it tries to be simple and efficient. 
> 
> And because it's so _incredibly_ fast for all the normal cases, you can 
> now spend some effort on figuring out renames dynamically for the few 
> cases where it fails. Does it do so now? No. Would adding UUID's help? 
> Hell no. It would be just an unmitigated disaster.
> 

Okay, how about keeping a cache (derived from the contents) of these types of data, to assist the merge if necessary? If it doesn't exist when needed, it can just be created, which may take O(n) time.

	-hpa
Previous: Linus TorvaldsNext: Junio C Hamano
Message 17 of 23 in “Moved files and merges”
  1. H. Peter AnvinSep 2, 2005
  2. Martin LanghoffSep 3, 2005
  3. H. Peter AnvinSep 4, 2005
  4. Junio C HamanoSep 3, 2005
  5. Junio C HamanoSep 3, 2005
  6. Fredrik KuivinenSep 3, 2005
  7. Junio C HamanoSep 3, 2005
  8. Junio C HamanoSep 3, 2005
  9. Sam RavnborgSep 3, 2005
  10. Junio C HamanoSep 3, 2005
  11. Sam RavnborgSep 3, 2005
  12. Junio C HamanoSep 4, 2005
  13. Daniel BarkalowSep 4, 2005
  14. Junio C HamanoSep 4, 2005
  15. H. Peter AnvinSep 5, 2005
  16. Linus TorvaldsSep 5, 2005
  17. H. Peter AnvinSep 5, 2005
  18. Junio C HamanoSep 5, 2005
  19. Junio C HamanoSep 5, 2005
  20. H. Peter AnvinSep 5, 2005
  21. Junio C HamanoSep 4, 2005
  22. Fredrik KuivinenSep 3, 2005
  23. Sam RavnborgSep 3, 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.