Re: Multi-ancestor read-tree notes

On Thu, Sep 08, 2005 at 12:16:05PM -0500, Darrin Thompson wrote:

On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:

quoted

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?

Is a baseless merge a merge with two branches that do not have a
common ancestor? That is, if we want to merge the branches A and B and
git-merge-base --all A B do not return any commits, is that a baseless
merge?

If that is the case then my merge code handles baseless merges
fine. Or, it is _supposed_ to handle them, I have done some basic
tests but it hasn't been tested thoroughly yet.

I don't know how the new read-tree code handles those cases.

- Fredrik