Re: correct git merge behavior or corner case?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Heya,

On Tue, Apr 21, 2009 at 10:56, Johannes Schindelin
<Johannes.Schindelin@xxxxxx> 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

-- 
Cheers,

Sverre Rabbelier
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]