On Sun, Jul 13, 2008 at 02:41:00PM +0200, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > > The test case when run will record the parents that were asked for which is > > fine. However, only c2 is recorded as a parent in the commit object. Both > > c1 and c2 should have been recorded. The merge is otherwise working > > correctly. > > Thanks for the testcase, I'm on it. ;-) So far what I see is that the input for the reduce_heads() function is (c1, c0, c2, c0, c1). The expected output would be (c1, c2), but the actual output is c2. So I suspect the bug is not in builtin-merge.c itself but in reduce_heads(). Hmm.. Adding Junio to Cc, who is the original author of reduce_heads().
Attachment:
pgp1YYpuBIa6p.pgp
Description: PGP signature
