Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
From: Chris Friesen
Date: Tue Apr 12 2005 - 16:17:49 EST
Petr Baudis wrote:
Dear diary, on Tue, Apr 12, 2005 at 11:50:48AM CEST, I got a letter
Well, yes, but the last merge point search may not be so simple:
A --1---2----6---7
B \ `-4-. /
C `-3-----5'
Now, when at 7, your last merge point is not 1, but 2.
...and this is obviously wrong, sorry. You would lose 3 this way.
Wouldn't the delta betweeen 2 and 5 include any contribution from 3?
Chris
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/