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

Re: Moved files and merges

From
Junio C Hamano <junkio@cox.net>
Date
Sep 3, 2005, 18:53 UTC
Message-ID
<7vslwmrnit.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<20050903180654.GB2314@c165.ib.student.liu.se>
Fredrik Kuivinen <freku045@student.liu.se> writes:
Show 8 quoted lines
> Maybe I am missing something... but why should the merge operation
> ignore renames? Is there a merge case when ignoring renames is the
> Right Thing to do?
>
> Lets say the branches A and B has the common ancestor C which contains
> a file named "foo". If A has renamed "foo" to "foobar" and B has made
> some content changes to "foo" shouldn't the result be a file named
> "foobar" with the content changes B made to "foo" in it?

Our messages mostly crossed, but as I described in the longer message I just sent out, the problem is that two lines of development runs in parallel, each of them wants to pick criss-cross nonstructural changes from the other, while keeping their own tree structure. If the goal of a 'merge' is to converge into a single commit for both lines of development to agree on a single tree structure to carry on from, then what you said is right, but the problem at hand is slightly different.

Previous: Fredrik KuivinenNext: Junio C Hamano
Message 7 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.