cvs2svn not putting newest version in trunk

[Joey Hess <jo...@kitenet.net>]

I have found several cvs repositories from which cvs2svn constructs
subversion repos that seem to have the wrong versions of some files in
trunk.

For example, my aalib cvs repo has this history for the ANNOUNCE file:

RCS file: /home/cvs/repository/joey-cvs/public/packages/aalib/ANNOUNCE,v
Working file: ANNOUNCE
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        debian_version_1_4p5-19: 1.1.1.2
        debian_version_1_4p5-18: 1.1.1.2
		...
revision 1.1
date: 1999/08/19 04:44:50;  author: joey;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.2
date: 2001/04/25 19:50:18;  author: joey;  state: Rel;  lines: +2 -5
Initial Import.
----------------------------
revision 1.1.1.1
date: 1999/08/19 04:44:50;  author: joey;  state: Rel;  lines: +0 -0
Initial Import

Now reading this, it's strange that it says that head is 1.1, since the
current version is 1.1.1.2, which is indeed the version I get when I
check it out of CVS. Maybe this is why cvs2svn gets confused.

After conversion, I get the 1999 version of the file in trunk, instead
of the newer one. I do find the newer version in some tags, like the
debian_version_1_4p5-19 tag.

Here's a reproduction recipe:

joey@kite:~/tmp> mkdir aatest
joey@kite:~/tmp> cd aatest
joey@kite:~/tmp/aatest> wget http://kitenet.net/~joey/tmp/aalib-cvs-repo.tgz >/dev/null
joey@kite:~/tmp/aatest> tar zxf aalib-cvs-repo.tgz 
joey@kite:~/tmp/aatest> svnadmin create aalib 
joey@kite:~/tmp/aatest> cvs2svn -s `pwd`/aalib home/cvs/repository/joey-cvs/public/packages/aalib >/dev/null
joey@kite:~/tmp/aatest> svn cat file:///`pwd`/aalib/trunk/ANNOUNCE |grep 'mailing list'
   Just join our mailing list: `aa@horac.ta.jcu.cz'.
joey@kite:~/tmp/aatest2>svn cat file:///`pwd`/aalib/tags/debian_version_1_4p5-18/ANNOUNCE | grep 'mailing list'
   Just join our mailing list: `aa-project-discuss@lists.sourceforge.net'.

The second email address is in the current version of the file,
if I check it out of CVS. Looking at the rcs file in the repository, it
does have 1.1 as the head, so I'm stumped. Bug in cvs or bug in
subversion, or some kinda PEBKAC?

I'm using subversion 0.33.0, rcs 5.7, cvs 1.12.2.

-- 
see shy jo

Re: cvs2svn not putting newest version in trunk

[Max Bowsher <ma...@ukf.net>]

Joey Hess wrote:
> I have found several cvs repositories from which cvs2svn constructs
> subversion repos that seem to have the wrong versions of some files in
> trunk.
> 
> For example, my aalib cvs repo has this history for the ANNOUNCE file:
> 
> RCS file: /home/cvs/repository/joey-cvs/public/packages/aalib/ANNOUNCE,v
> Working file: ANNOUNCE
> head: 1.1
> branch: 1.1.1
> locks: strict
> access list:
> symbolic names:
>         debian_version_1_4p5-19: 1.1.1.2
>         debian_version_1_4p5-18: 1.1.1.2
> ...
> revision 1.1
> date: 1999/08/19 04:44:50;  author: joey;  state: Exp;
> branches:  1.1.1;
> Initial revision
> ----------------------------
> revision 1.1.1.2
> date: 2001/04/25 19:50:18;  author: joey;  state: Rel;  lines: +2 -5
> Initial Import.
> ----------------------------
> revision 1.1.1.1
> date: 1999/08/19 04:44:50;  author: joey;  state: Rel;  lines: +0 -0
> Initial Import
> 
> Now reading this, it's strange that it says that head is 1.1, since the
> current version is 1.1.1.2, which is indeed the version I get when I
> check it out of CVS. Maybe this is why cvs2svn gets confused.

http://subversion.tigris.org/issues/show_bug.cgi?id=1510

Max.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org