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

Re: correct git merge behavior or corner case?

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 21, 2009, 09:04 UTC
Message-ID
<alpine.DEB.1.00.0904211103380.10279@pacific.mpi-cbg.de>
In-Reply-To
<fabb9a1e0904210200j5f82e9ci440b99ab18016938@mail.gmail.com>
Hi,
On Tue, 21 Apr 2009, Sverre Rabbelier wrote:
Show 19 quoted lines
> On Tue, Apr 21, 2009 at 10:56, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> > But they would be a good example why we do _not_ want rename detection
> > there.
> 
> Yes, I would agree that they are indeed a good example. The other day
> I moved a directory in a python project (containing several
> sub-directories and as such several empty __init__.py files), and it
> renamed them rather wrongly :P.
> 
> The diff looked something like:
> Renamed root/old/a/__init__.py to root/new/b/__init__.py
> Renamed root/old/b/__init__.py to root/new/c/__init__.py
> Renamed root/old/c/__init__.py to root/new/a/__init__.py
> 
> While of course, a better result would have been:
> Renamed root/old/a/__init__.py to root/new/a/__init__.py
> Renamed root/old/b/__init__.py to root/new/b/__init__.py
> Renamed root/old/c/__init__.py to root/new/c/__init__.py

Heh, at some point I had a patch in my tree (dunno if it still there) to use Levenshtein for rename detection, that should have helped...

Ciao, Dscho

Previous: Sverre RabbelierNext: Johannes Schindelin
Message 11 of 17 in “correct git merge behavior or corner case?”
  1. Tuncer AyazApr 19, 2009
  2. Shawn O. PearceApr 20, 2009
  3. Johannes SchindelinApr 20, 2009
  4. Anders MelchiorsenApr 20, 2009
  5. Jeff KingApr 21, 2009
  6. Jeff KingApr 21, 2009
  7. Junio C HamanoApr 21, 2009
  8. Sverre RabbelierApr 21, 2009
  9. Johannes SchindelinApr 21, 2009
  10. Sverre RabbelierApr 21, 2009
  11. Johannes SchindelinApr 21, 2009
  12. Johannes SchindelinApr 21, 2009
  13. Michał KiedrowiczApr 21, 2009
  14. Michał KiedrowiczApr 21, 2009
  15. Jeff KingApr 21, 2009
  16. Michał KiedrowiczApr 21, 2009
  17. Jeff KingApr 21, 2009

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.