Re: CVS -> SVN -> Git

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Jul 14, 2007, 20:01 UTC
Message-ID: <46992B9B.1070306@alum.mit.edu>
In-Reply-To: <20070714173223.GA25574@pe.Belkin>

Chris Shoemaker wrote:

> [...] I, for one, would be interested to know how
> cvs2svn's output compared to CVSps's, especially w.r.t. detecting each
> branch's parent.

The problem, as I'm sure you are aware, is that CVS does not record unambiguously the parent of a branch. For example, the following two situations are indistinguishable from the data stored in CVS:

1. Create BRANCH1 from trunk, then create BRANCH2 from BRANCH1 before
making any commits to BRANCH1

2. Create BRANCH1 from trunk, then create BRANCH2 from the same trunk
revision.

Older versions of cvs2svn would always create both branches from trunk.
 cvs2svn 2.0 gathers statistics about the "possible parents" of each
symbol across multiple files.  If BRANCH1 and BRANCH2 occur in another
file in a context that makes it clear that BRANCH2 was created from
BRANCH1 (i.e., because a revision was committed to BRANCH1 before
BRANCH2 was created), then it attempts to use BRANCH1 as the parent of
BRANCH2 in all files.

So yes, cvs2svn is somewhat intelligent about determining the correct branch ancestry.

Michael