Re: [PATCH] cvsps/cvsimport: fix branch point calculation and broken branch imports

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 3, 2008, 02:06 UTC
Message-ID: <7viqyz66b3.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1207187090.17329.15.camel@gandalf.cobite.com>

David Mansfield <david@cobite.com> writes:

> Also, how does the git packaging (non-rpm version) specify and/or
> guarantee dependencies are at a certain version anyway?

We cannot really do much with the old cvsimport out in the field, but I was wondering more about automatic detection in new cvsimport.

The way I read 02-cvsps-implement-branch-point-detection.patch, you have three cases:

 - "Ancestor branch:" is not followed by "Branches:" before "Log:"
   (old cvsps);

 - "Ancestor branch:" is followed by "Branches:" before "Log:" (new);

 - "Branches:" without "Ancestor branch:" (new);

So perhaps your 04-cvsimport-redo-branch-creation-process.patch, instead of ignoring what "Ancestor branch:" said, can remember it has seen what "ancestor" (which may be a bit off) information it was given, and when you see "Log:" (by that time, you either have seen "Branches:" from new cvsps, or you didn't see it from old cvsps) you can decide which vintage of cvsps it is reading from.

Or something like that.