Hi, Just by accident I noticed, that git-cvsimport got the parents for branches wrong in one of my projects. To assist in debugging this, I've made up a testcase script (appended to this mail). It will create a new cvs-repo, put 4 commits in it, and finally run gitk to investigate it. It should look something like this: 4 [branch-stable-fixes] commit-on-branch 3 | [master] [origin] commit-master-after-branch |/ 2 [tag-branchpoint] commit-first-edit 1 commit-base What it really looks like: 4 .. 3 .. 2 .. 1 .. 4's parent is 3, not (as it should) 2. I've tested with 1.4.0 and the current git-cvsimport from 8fced61. I hope the testcase helps tracking the problem down. Elrond p.s.: The testcase script is not nice. It just does the job, nothing more.
Attachment:
cvs-branches-1.sh
Description: Bourne shell script