From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Tue, 19 Jun 2007 08:31:38 GMT
Subject: Re: blame follows renames, but log doesn't
Message-ID: <46a038f90706190131ub087df0pd7814b477c2a3b40@mail.gmail.com>
In-Reply-To: <20070619071916.GC9177@thunk.org>

On 6/19/07, Theodore Tso <tytso@mit.edu> wrote:
> Actually, the bigger missing gap is merges.  Suppose in the
> development branch, you rename a whole bunch of files.  (For example,
> foo_super.c got moved to foo/super.c, foo_inode.c got moved to
> foo/inode.c, etc.)

I thought that the "recursive" strategy covered this - though I don't
work on a tree that merges across branches with renames, so my
experience is _very_ limited.

>From Documentation/merge-strategies.txt:

  Additionally this can detect and handle merges involving
  renames.  This is the default merge strategy when
  pulling or merging one branch.

cheers


m