Re: Last mile for 1.0

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 6, 2005, 06:44 UTC
Message-ID: <Pine.LNX.4.58.0506052341330.1876@ppc970.osdl.org>
In-Reply-To: <7vpsv0uh5d.fsf@assigned-by-dhcp.cox.net>

On Sun, 5 Jun 2005, Junio C Hamano wrote:

Show 11 quoted lines

> >>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
> 
> LT> And the "git-merge-one-file-script" thing needs to be updated to keep the
> LT> tree updated as it merges things by hand, since it can't depend on the
> LT> git-checkout-cache fixing things up any more. Anybody?
> 
> I'd love to bite.  One problem I have been having for the last
> 30 minutes or so is that t1000 test (merge from h*ll) does not
> show that read-tree resolving even the trivial ones anymore, and
> I do not know if you want make it that the responsibility of
> git-merge-one-file-script, or if it is just an oversight.

It was just two really stupid bugs, both due to me trying to make the three different merge loops look a bit more like each other, and that had broken the three-way case in two different ways.

Should be fixed, as soon as the mirroring pushes out the last off-by-one fix.

			Linus