[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: cvs2svn (6485) chooses wrong revision to create branch?

From: <kfogel_at_collab.net>
Date: 2003-07-18 16:25:15 CEST

Mike Wilcox <mike@trouble.org.uk> writes:
> $ python cvs2svn.py -s repos --no-prune cvsroot/<project>
> ...
> <<< Started new txn, based on original revision 1559
> * editing path : branches/branch2/<blah>/file1 ... done.
> * editing path : branches/branch2/<blah>/file2 ...
> svn: Filesystem has no item
> svn: file not found: transaction `17b', path `branches/branch2/<blah>/file2'

This is almost certainly issue #1421 (whose cause is known now, I'm
writing a regression test currently & then will fix).

> From cvs2svn-dump, the major points I can see leading up to this event are:
> rev 1459: source of branch1
> rev 1469: creation of 'branches/branch1'.
> rev 1544: source of branch2
> rev 1556: creation of 'trunk/<blah>/file2'
> rev 1558: first creation of 'branch2', from trunk at 1544.
> Some deletion & addition/changes, but nothing to file2.
> rev 1559: attempt to edit 'branches/branch2/<blah>/file2'.
> The CVS Repository has a revision 1.1 of file2, whose timestamp
> matches (-ish) the rev 1556 creation, and a rev whose
> timestamp matches the update in 1559. The definition of the symbol for
> branch2 is I don't think cvs2svn has lost any revisions
> inbetween.
> From this, I have some suspicion that cvs2svn has created the copy of
> branch2 from the wrong place - it should have been at least rev 1556.

The issue isn't whether the branch as a whole was copied from 1556,
but whether file2 was correctly spliced in from 1544. However, note
that a parent (or grandparent, etc) of file2 could have been copied
from an earlier revision. Did you check for that?

> However, the CVS repository is huge, and I haven't been able to prune
> it down to something that will be able to help identify the cause of
> the problem. And at 150 minute run-time, it's too much for
> trial-and-error :-(
> Any clues as to how I could add extra debugging to cvs2svn, or how to
> selectively whittle down the CVS repository?

I just put in print statements :-). You might want to just wait until
current issues are fixed and just try again, though, especially #1421.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 18 17:18:58 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.