From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 01 Jul 2006 20:04:24 GMT
Subject: Re: A note on merging conflicts..
Message-ID: <Pine.LNX.4.64.0607011301480.12404@g5.osdl.org>
In-Reply-To: <44A6CD1D.2000600@lsrfire.ath.cx>



On Sat, 1 Jul 2006, Rene Scharfe wrote:
> 
> I wonder why the two clear_commit_marks() calls at the end of
> get_merge_bases() are not sufficient, though.

Why does that thing check for "parent->object.parsed"?

Also, it only clears commit marks if they are contiguous, but some commit 
marking may not be dense (eg, the "UNINTERESTING" mark may have been set 
by (PARENT1 && PARENT2) triggering, but is not set in the commits that 
reach it.

		Linus