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

[David Mansfield <david@cobite.com>]

[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]

Hi Everyone,

This email addresses a long-standing bug with the cvsimport which is due
to a bugs in cvsps.  The bug is that branches can be forked off too
late.  

In case you're wondering, I'm actually the original author of cvsps,
which is behind the scenes for cvsimport.  I don't call myself
maintainer because I've hardly been that over the last few years.

Anyway, the fix to cvsps is attached (1st 2 patches) as well as the
patch to git-cvsimport.perl (2nd 2 patches) against the master branch as
of today's git repo.

The cvsps patches apply with fuzz against the 2.1 version which is out
there.

The full tarball of the latest cvsps version including this is available
on the website http://www.cobite.com/cvsps as well, the version is
2.2b1.

I plan to find time in the next week or so to merge all of the
outstanding patches from Yann Dirson's git repo, publish cvsps via a git
repo myself, and fix other bugs as time permits (including adding
support for multiple tags).

I'd mainly like feedback if anyone can test this.

Also, as I'm actually a newb. to this list, if I'm violating any rules,
such as how to post the patches, let me know.

Thanks,
David

P.S Also, as many people may have imported broken branches already, can
anyone thing of a way to fix the branch, (maybe with git-rebase or
something)?  The breakage affects, I believe, files not ever modified on
the branch until any given point in time on the branch...


[-- Attachment #2: 01-cvsps-add-branch-object.patch --]
[-- Type: application/mbox, Size: 3429 bytes --]

[-- Attachment #3: 02-cvsps-implement-branch-point-detection.patch --]
[-- Type: application/mbox, Size: 3100 bytes --]

[-- Attachment #4: 03-cvsimport-parse-new-cvsps-output.patch --]
[-- Type: application/mbox, Size: 1252 bytes --]

[-- Attachment #5: 04-cvsimport-redo-branch-creation-process.patch --]
[-- Type: application/mbox, Size: 4260 bytes --]