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

Greg Ward wrote:
> 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:

Hmmm, the cvs2svn source code suggests that files added on a branch
should have a log message that matches the following regexp:

    r'file .* was initially added on branch .*\.\n$'

The current CVS source code agrees, as does the CVS source code back to
version 1.1 of the file commit.c.

Your example files' log messages are missing the word "initially" and
the trailing ".".

Now, it could easily be that CVS's behavior was different under some
circumstances, or that these files were added using some other variant
of CVS (or even RCS?!) which doesn't include the trailing ".".  Do you
happen to know whether it is possible to create the files that you have
using some legitimate CVS commands?  If so, I'd be happy to tweak the
regular expression to allow these log messages.

If not, I'd rather leave things the way that they are.  (I want to be
very conservative about discarding revisions.)  In this case, I suggest
that you hand-edit the three log messages to match the expected pattern;
then they will be omitted by cvs2svn.

Michael

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

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