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

RE: Rcsparse.py

From: Dale Hirt <dale_at_sbcltd.com>
Date: 2003-02-26 00:19:58 CET

Karl,

Yes, I'm at head. I've been updating every hour or so just to make sure.

I'll try shipping my cvs repository over to a linux machine I have here.
Although I don't have all the cool svn dev stuff setup there, so it might be
till tomorrow before I can truly test it out.

Dale

-----Original Message-----
From: Karl Fogel [mailto:kfogel@newton.ch.collab.net]
Sent: Tuesday, February 25, 2003 2:43 PM
To: Dale Hirt
Cc: Subversion Development Mailing List (E-mail)
Subject: Re: Rcsparse.py

Dale Hirt <dale@sbcltd.com> writes:
> I tried this with a sourceforge project that I am currently owner of,
> libzvtmm. Went to http://cvs.sourceforge.net/cvstarballs/ and picked up
> libzvtmm-cvsroot.tar.gz. I un{gzip, tar} in an empty directory, getting a
> folder of libzvtmm. Then, I run the following command:
>
> python cvs2svn.py --create -s svn-libzvtmm libzvtmm
>
> I've attached the single binary ,v file that it chokes on. I am also on
> windows, though. I don't know if that will make a difference.

It may be that the OS is the difference. I tried this in a
subdirectory of tools/cvs2svn:

   $ pwd
   /home/kfogel/src/subversion/tools/cvs2svn/foo
   $ ls
   libzvtmm/
   $ ../cvs2svn.py --create -s svn-libzvtmm libzvtmm

   [~850 lines of output omitted]

   pass 1: 0 seconds
   pass 2: 0 seconds
   pass 3: 0 seconds
   pass 4: 43 seconds
    total: 44 seconds
   $

I assume you were at head (i.e., you're using the trunk cvs2svn, from
revision 5101 or higher, and the rcsparse.py in that same directory)?

Note that there was some weird noise in the output. Before every
revision it would report a conflict:

    CONFLICTS: '_e08d0f08_p_char'
    new revision: 8

However, that code in cvs2svn.py is, shall we say, subject to
examination at the moment. It reads:

    conflicts, new_rev = fs.commit_txn(txn)

    # set the time to the proper (past) time
    fs.change_rev_prop(t_fs, new_rev, 'svn:date', date, c_pool)

    ### how come conflicts is a newline?
    if conflicts != '\n':
      print ' CONFLICTS:', `conflicts`
    print ' new revision:', new_rev

There seems to be some type conversion lossage going on here; since
the revisions did keep incrementing, I don't think there was ever an
actual conflict.

But anyway, that's all a separate problem from what you reported,
which was far more severe.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 26 00:20:50 2003

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