Re: Errors GITtifying GCC and Binutils

From: Linus Torvalds <torvalds@osdl.org>
Date: Mar 23, 2006, 00:12 UTC
Message-ID: <Pine.LNX.4.64.0603221607580.26286@g5.osdl.org>
In-Reply-To: <Pine.LNX.4.64.0603221517210.26286@g5.osdl.org>

On Wed, 22 Mar 2006, Linus Torvalds wrote:

Show 11 quoted lines

> 
> Looking at cvsps output (from
> 
> 	cvsps --norc -u -A -v -d --cvsdirect
> 		--root :pserver:anoncvs@sourceware.org:/cvs/src
> 		src > cvsps.out 2> cvsps.err
> 
> it's "PatchSet 104" (well, for me it is, I have a hacked cvsps, so it 
> might not be that for you), which creates the "gdb-4_18-branch", but it 
> appears that cvsps hasn't actually figured out any "Ancestor branch" for 
> that commit.

It _seems_ that the reason for that is that cvsps considers a revision number of 1.1.1.1 to have a "dot depth" of 0, for some really strange reason (it's a total special case).

And that will currently not compare as a "greater" dot depth than not having any revision number at all for the ancestor, so such a revision will never be considered an ancestor branch.

This one-liner to cvsps.c seems to make sure we have an ancestor branch for that "gdb-4.18-branch" branch, at least according to the cvsps output. I'm re-running "git cvsimport" with this cvsps to see if it gets us past that one point, but I need to go pick up Patricia from school, so I won't have time to actually check the result. If somebody wants to play with this, go wild.

(The point of this patch is to make sure that if the head PatchSet doesn't have an ancestor, we'll consider _any_ valid ancestor to be better than that).

		Linus

---

diff --git a/cvsps.c b/cvsps.c
--- a/cvsps.c
+++ b/cvsps.c
@@ -2599,7 +2599,7 @@ static void determine_branch_ancestor(Pa
 	 * note: rev is the pre-commit revision, not the post-commit
 	 */
 	if (!head_ps->ancestor_branch)
-	    d1 = 0;
+	    d1 = -1;
 	else if (strcmp(ps->branch, rev->branch) == 0)
 	    continue;
 	else if (strcmp(head_ps->ancestor_branch, "HEAD") == 0)