Re: [PATCH 14/14] Build in merge

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 1, 2008, 23:55 UTC
Message-ID: <7v63rpkvme.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <0cde1e7c930589364318b2d0344b345453e23586.1214918017.git.vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

Show 10 quoted lines

> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
> ---
>
> Interdiff: git diff 01a7dae..7709df7
>
> Individual commits (there is only one change this time): git log 7709df7
>
> Ah and please don't forget to apply the testsuite fix I sent in
> $gmane/86981. (Or is it easier if I resend the whole series?)

Are you sure about that?  I've been deliberately fixing that patch.

As far as I understand it, your series:

 - starts out building infrastructure;
 - adds tests;
 - finally replaces git-merge with the new implementation.

and the test in question comes when git-merge built from that version is still the scripted version with limitation.

So if you build and test after applying individual steps (you sure do that, don't you?), the test has to start with expecting failure (from the scripted git-merge that has the octopus limitation) and then later changed to expect success when git-merge is replaced.

Have you looked at the series I fixed up before pushing out in 'pu' last night, specifically 5948e2a and 01a7dae? If you actually built and tested 5948e2a, you'd notice that the test in that commit *must* expect failure.