Re: cvs2svn: another vendor branch problem?

And to reply to myself again (are you guys getting bored of me yet? :)

On Wed, Feb 18, 2004 at 05:30:10PM +0100, Stijn Hoop wrote:
> Now the only difference between the CVS and Subversion checkouts is
> the fact that given identical 1.1 and 1.1.1.1 revisions, CVS checks out
> revision 1.1.1.1 and Subversion checks out revision 1.1. This
> leads to diffs in $Id$ keyword expansion lines in the source files.

I tried to fix this in the spirit of issue 1474, which is to say it would be
nice if the 'empty' revision could be optimized away. However this is simply
not correct (as I found out while testing some ways to fix this); in CVS, the
file can change between revision 1.1 and revision 1.1.1.1 -- due to exactly
the problem I was trying to solve, keyword expansion. Witness this from the
(now correctly) converted repository:

%%

[stijn@firsa] <~/src/svntest/tr/trunk> svn diff -r2 DNSSEC
Index: DNSSEC
===================================================================
--- DNSSEC (revision 2)
+++ DNSSEC (working copy)
@@ -1,4 +1,4 @@
-$Id: DNSSEC,v 1.1 1999/11/30 02:41:37 peter Exp $
+$Id: DNSSEC,v 1.1.1.1 1999/11/30 02:41:37 peter Exp $

 DNSSEC Notes:

[stijn@firsa] <~/src/svntest/tr/trunk> svn log -r3 DNSSEC
------------------------------------------------------------------------
r3 | cvs2svn | 1999-11-30 03:41:37 +0100 (Tue, 30 Nov 1999) | 3 lines

This commit was generated by cvs2svn to compensate for changes in r2,
which included commits to RCS files with non-trunk default branches.

------------------------------------------------------------------------
[stijn@firsa] <~/src/svntest/tr/trunk>

%%

I ripped out the part in Commit.commit that special cased the 1.1.1.1
revision, and now I have an absolutely identical trunk checkout between CVS
and Subversion. Attached is the patch to cvs2svn.py that I used (it contains
the previous patch for the branch from a vendor branch issue as well).

Hope this helps someone,

--Stijn

-- 
Remember, kids: "Q" is always followed by "U". You can learn more on the
Internet in the Spelling FAQU.
		-- James "Kibo" Parry