Subject: Re: [bug?] checkout -m doesn't work without a base version

From: Andreas Schwab <[email-masked]>
Date: Thu, 15 Dec 2011 11:42:10 +0100

Junio C Hamano <[email-masked]> writes:

> The variable "mode" is assigned to when we see an stage #2 entry in the
> loop, and we should have updated threeway[1] immediately before doing so.
> If threeway[1] is not updated, we would have already returned before using
> the variable in make_cache_entry().

How can you be sure that ce_stage(ce) ever returns 2?

Andreas.

-- 
Andreas Schwab, [email-masked]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."