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

[David Mansfield <david@cobite.com>]

On Wed, 2008-04-02 at 19:06 -0700, Junio C Hamano wrote:
> 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.

Quite right.  And also, one of the failure modes I've found is based on
real abuse of cvs, and the result is that cvsps shows the branch as
occurring AFTER the first commit on that branch.  Anyway, it's all
nonsense and hand waiving after all.  cvsps just creates an illusion
anyway.

But to fix it, I'll need something similar to the code that I removed
anyway, so that will definitely be in the mix when all is said and done.

David