On Thu, 26 Jun 2003, mark benedetto king wrote:
> 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')
>
The patch certainly fixes the abnormal termination of the script, but now
I'm getting:
co:
/s/uranus/projects/CVSRoot/BattleStorm/data/images/Software/BattleStorm_InstallShield_Exterior.bmp,v:11:
missing ';' after 'author'
co aborted
which doesn't make me feel good. These errors occur on all RCS *,v files
that have a space in between two text tokens before the ';' character in
the author field.
I think it is still not doing something correctly. Notice that this error comes
from the RCS co command. I'm running this on both RedHat 8.0 and RedHat 9.0
with the same results.
Ideas?
Thanks!
--
David Wayne Summers "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint = C0 E0 4F 50 DD A9 B6 2B 60 A1 31 7E D2 28 6D A8
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 27 01:11:34 2003