From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Aug 2012 22:16:38 GMT
Subject: Re: [PATCH 2/2] commit: use a priority queue in merge base functions
Message-ID: <7vy5kwowjd.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120830214802.GB18636@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> So the issue is that when you do a recursive merge with multiple bases,
> the order in which you visit the recursive bases is going to impact the
> exact conflicts you see.

Yeah, that explains it.

> So the test is not broken or racy, which is good. It is just testing
> something that is somewhat of an implementation detail. We could switch
> it to use test_tick, and then adjust the expected output to look for the
> expected conflict that git happens to generate in that case. But that is
> no better than the current behavior.

True.

> But I'm not sure there is a way to test what it wants to test (that we
> hit a conflict that involves one of the recursive merge bases) without
> relying on the implementation detail. So I'm inclined to just leave it
> in place.

OK.