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

Re: cvs2svn.py fails converting repository with the attached file

From: mark benedetto king <mbk_at_lowlatency.com>
Date: 2003-06-26 19:15:49 CEST

On Thu, Jun 26, 2003 at 06:36:10PM +0200, e.huelsmann@gmx.net wrote:
> Hi,
>
> Some time in the past I have committed files to my cvs repository with
> spaces in the author name (ie USER="Erik Huelsmann") obviously, this was before I
> started using unix, but the repository came with me to my new OSes. CVS nor
> RCS choke on it, but cvs2svn.py does. It happens - amongst other files - with
> the file attached to this mail. Should an issue be created for this?
>

Not if the following patch fixes it. :-)

rcsparse isn't technically part of svn, so I haven't committed
this change. :-(

Let me know if this works.

--ben

--- tools/cvs2svn/rcsparse/common.py Sun Jun 8 18:08:27 2003
+++ tools/cvs2svn/rcsparse/common.py Thu Jun 26 13:10:43 2003
@@ -153,11 +153,16 @@
       timestamp = compat.timegm(tuple(date_fields))
 
       # Parse author
- semi, author, sym = self.ts.mget(3)
+ sym = self.ts.get()
       if sym != 'author':
         raise RCSExpected(sym, 'author')
- if semi != ';':
- raise RCSExpected(semi, ';')
+ author = ''
+ while 1:
+ token = self.ts.get()
+ if token == ';':
+ break
+ author = author + token + ' '
+ author = author[:-1]
 
       # Parse state
       self.ts.match('state')

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 19:17:29 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.