From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Sep 2005 17:51:45 GMT
Subject: Re: Another merge test case from the kernel tree.
Message-ID: <7v7jdjleq6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20050914174251.GA21639@c165.ib.student.liu.se>

Fredrik Kuivinen <freku045@student.liu.se> writes:

> It works for me. The 'recursive' strategy cleanly merges this and
> produces a result identical to the actual commit.
>
> The tree object 1d20af805193ab9982a48cb4c828c0f6af034c6c is the tree
> of the commit a1cddb88920b915eaba10712ecfd0fc698b00a22 which is one of
> the common ancestors. Are you sure that you got the entire repository? 
> It took some time for me to figure out that 'git clone
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
> aegl.git' will _not_ give you a usable repository. You have to change
> aegl.git/.git/objects/objects/info/alternates before it becomes
> usable.

Ah, that figures..  I was looking at Tony's repository right
now.

Thanks.