One more little bug with "file X was added on branch Y" revisions

The good news: Michael's recent commits to fix issue #127 worked
great, reducing my count of bogus "File X was added on branch Y"
revisions from 1303 to 3 (that's out of ~108,000 revisions total).

But 3 != 0.  I can tolerate that, but in case anyone is interested, it
appears that cvs2svn still misses one corner case: files that were
added on a CVS branch and never merged to the trunk.  I have 3 such
files in my repository.  Here's "cvs log" output on one of them:

"""
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        BRANCH1: 1.1.0.2
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.1
date: 2005/12/05 22:35:31;  author: gward;  state: dead;
branches:  1.1.2;
file file1 was added on branch BRANCH1
----------------------------
revision 1.1.2.1
date: 2005/12/05 22:35:31;  author: gward;  state: Exp;  lines: +0 -0
add three files on branch
=============================================================================
"""

(The other two are basically identical, since these 3 files were added
in the same commit on BRANCH1 and then never went anywhere else.)

And here is the "svn log" output after converting those 3 files to Subversion:

"""
------------------------------------------------------------------------
r5 | gward | 2005-12-05 17:35:35 -0500 (Mon, 05 Dec 2005) | 2 lines
Changed paths:
   A /branches/BRANCH1
   A /branches/BRANCH1/file1
   A /branches/BRANCH1/file2
   A /branches/BRANCH1/file3

add three files on branch

------------------------------------------------------------------------
r4 | gward | 2005-12-05 17:35:33 -0500 (Mon, 05 Dec 2005) | 2 lines
Changed paths:

file file3 was added on branch BRANCH1

------------------------------------------------------------------------
r3 | gward | 2005-12-05 17:35:32 -0500 (Mon, 05 Dec 2005) | 2 lines
Changed paths:

file file2 was added on branch BRANCH1

------------------------------------------------------------------------
r2 | gward | 2005-12-05 17:35:31 -0500 (Mon, 05 Dec 2005) | 2 lines
Changed paths:

file file1 was added on branch BRANCH1

------------------------------------------------------------------------
r1 | convert-repo | 2005-12-05 17:35:31 -0500 (Mon, 05 Dec 2005) | 1 line
Changed paths:
   A /branches
   A /tags
   A /trunk

Standard project directories initialized by cvs2svn.
------------------------------------------------------------------------
"""

I'll attach a tarball of the CVS repository with just those 3 files.
BTW, I suspect one of them is sufficient to reproduce.

Let me know if you want anything else...

Greg

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1667&dsMessageId=2393716

To unsubscribe from this discussion, e-mail: [[email protected]].