cvps sometimes can't identify a branch for a specific revision, it shows messages like: WARNING: revision 1.36.2.2 of file Makefile.in on unnamed branch and uses #CVSPS_NO_BRANCH as branch name in its output.
This checkin makes it so that git-cvsimport ignores such branches, and when they appear as ancestor branch, it maps them to HEAD.
Signed-off-by: Christian Biesinger <cbiesinger@web.de>
---
I tried to import the Mozilla CVS Repository into git, just for fun, and it failed. This is one of the patches that are required for it.
I hope I did this right, I'm not so familiar with git... Documentation/SubmittingPatches says to mail patches to the maintainer, who is that? :)
git-cvsimport.perl | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
ed142593c84ba76580e780ce8f12244214023213
Show changes to git-cvsimport.perl +11 −0
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 00fc3ba..4b8ca95 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -799,7 +799,18 @@ while(<CVS>) { $state = 11; next; } + if ($branch eq "#CVSPS_NO_BRANCH") { + # skip + print "skip patchset $patchset: unknown branch\n" if $opt_v; + $state = 11; + next; + } if($ancestor) { + if ($ancestor eq "#CVSPS_NO_BRANCH") { + # skip + print "In patchset $patchset: ancestor branch unknown, setting to $opt_o" if $opt_v; + $ancestor = $opt_o; + } if(-f "$git_dir/refs/heads/$branch") { print STDERR "Branch $branch already exists!\n"; $state=11;
-- 1.1.6
