From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 27 Nov 2006 11:29:06 GMT
Subject: Re: Some tips for doing a CVS importer
Message-ID: <456ACC02.6090508@alum.mit.edu>
In-Reply-To: <4569BCB8.9030809@gmx.net>

Marko Macek wrote:
>> Another note for doing a converter. When combining things into change
>> sets, for git import the comments in the branches should not be mixed
>> between branches and the trunk when detecting change set. Git doesn't
>> allow simultaneous commits to the trunk and branches.
> 
> Yup, this is the current problem I'm facing now. Even for CVS->SVN
> conversion,
> I don't want to see multi-branch commits.

To avoid multi-branch commits, you have to start cvs2svn with an
--options file, and in the options file set

ctx.cross_project_commits = False