Re: Multi-ancestor read-tree notes

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Sep 8, 2005, 21:39 UTC
Message-ID: <Pine.LNX.4.63.0509081727560.23242@iabervon.org>
In-Reply-To: <1126199765.3984.1.camel@localhost.localdomain>

On Thu, 8 Sep 2005, Darrin Thompson wrote:

Show 6 quoted lines

> On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
> > I've got a version of read-tree which accepts multiple ancestors and does 
> > a merge using information from all of them.
> 
> Do the multiple ancestors have to share a common parent? More to the
> point, is this read-tree any more friendly to baseless merges?

read-tree doesn't care about the relationships between its inputs; it's only interested in the trees. But using ancestors which aren't common is unlikely to give you desired results. I think, if you do read-tree a^ b^ a b, you will get everything into the index, but it'll all going to be conflicts.

I assume that what you want is something to include everything from two commits, which would give conflicts if a name is reused?

	-Daniel
*This .sig left intentionally blank*