From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Fri, 02 Dec 2005 08:36:52 GMT
Subject: Re: What's new in git.git master branch
Message-ID: <20051202083652.GA4824@c165.ib.student.liu.se>
In-Reply-To: <7vmzjljgwo.fsf@assigned-by-dhcp.cox.net>

On Thu, Dec 01, 2005 at 01:38:47AM -0800, Junio C Hamano wrote:

> Currently, rename result is recorded by using "git-update-index
> --cacheinfo" to populate the index.  This method unfortunately
> can only create a stage0 entry.  We can go two ways.  One way is
> to support "register this mode/sha1 tuple at stageN for path" to
> update-index.  Another would be for merge-recursive to first
> construct three trees with the final directory structure
> (i.e. prepare three temporary trees with renames applied) and
> run read-tree 3-way merge on these temporary trees.  I suspect
> the former is probably of lesser impact.  Thoughts?

If we really want to do this then the former is certainly easier from
the perspective of git-merge-recursive.

- Fredrik