Git cvsimport failed: failed to merge master into current branch

Question

I am trying to import a project that has grown over the years in cvs. It has several branches for releasing patches, tags and heads. This is the command I use:

 git cvsimport -r cvs -k -d :pserver:<USERNAME>@cvs:/home/cvsroot <MODULNAME>

It worked great a few weeks ago. A few days ago, a branch was created for the current version, where people are still committing, while others are already working on their heads for the next stage. This branch will later be merged into the head.

Instantly, the process does not work with the following messages below:

fatal: Needed a single revision
fatal: Can merge only exactly one commit into empty head
Could not merge master into the current branch.

What is the reason? How can I handle this?

Answer 1

, , 2006 . :

• git
• cvs

:

mkdir project.cvs    
mkdir project.git    
cd project.git
git init
touch test
git add test
git commit -m "initial" --date="2010-01-01 00:00:00"
cd ../project.cvs
git cvsimport -o master -C ../project.git -k -d :pserver:<USERNAME>@cvs:/home/cvsroot <MODULENAME>

, , git, 2010 .

Answer 2

:

$ cvs -d :pserver:[e-mail]:/path/to/cvsroot login
$ git-cvsimport -v -a -i -k -d pserver:[e-mail]:/path/to/cvsroot -C <git_repository> <cvs_module>

:

-v: verbose; report a lot of information about what going on
-a: import all commits, not just recent ones
-i: import-only. don't mess with working directory
-k: 'kill keywords': no CVS keyword expansion (e.g. $Date$)
-d: root of cvs archive (you could also set CVSROOT if you really wanted to)