From: Sverre Rabbelier <srabbelier@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Anders Melchiorsen <mail@cup.kalibalik.dk>,
Tuncer Ayaz <tuncer.ayaz@gmail.com>,
git@vger.kernel.org
Subject: Re: correct git merge behavior or corner case?
Date: Tue, 21 Apr 2009 11:00:30 +0200 [thread overview]
Message-ID: <fabb9a1e0904210200j5f82e9ci440b99ab18016938@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0904211055160.10279@pacific.mpi-cbg.de>
Heya,
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
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-04-21 9:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-19 22:40 correct git merge behavior or corner case? Tuncer Ayaz
2009-04-20 3:19 ` Shawn O. Pearce
2009-04-20 9:49 ` Johannes Schindelin
2009-04-20 10:10 ` Anders Melchiorsen
2009-04-21 2:44 ` Jeff King
2009-04-21 2:51 ` Jeff King
2009-04-21 3:09 ` Junio C Hamano
2009-04-21 8:48 ` Sverre Rabbelier
2009-04-21 8:56 ` Johannes Schindelin
2009-04-21 9:00 ` Sverre Rabbelier [this message]
2009-04-21 9:04 ` Johannes Schindelin
2009-04-21 9:01 ` Johannes Schindelin
2009-04-21 17:27 ` Michał Kiedrowicz
2009-04-21 17:54 ` Michał Kiedrowicz
2009-04-21 18:05 ` Jeff King
2009-04-21 18:47 ` Michał Kiedrowicz
2009-04-21 19:11 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2009-04-20 14:50 François Beausoleil
2009-04-21 19:27 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fabb9a1e0904210200j5f82e9ci440b99ab18016938@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mail@cup.kalibalik.dk \
--cc=peff@peff.net \
--cc=tuncer.ayaz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).