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

Re: %file unwise?

From: Jani Averbach <jaa_at_jaa.iki.fi>
Date: 2004-12-05 14:04:16 CET

On 2004-12-03 16:19-0700, Gary Thomas wrote:
> I'm converting an old CVS repository which has many files named %meta.
> Mostly this has worked fine, until I tried a merge between two branches
> where one branch had a %meta file that had to be created as a result of
> the merge. When I went to commit, I got an error:

You have been bitten by this:

The good news is that this is fixed, and should be in 1.1.2 when it
will be released.

In the meantime, you have couple of options:

Set up temporary ra_svn (svnserve) server, and do the merge via it.
The bug only affects ra_dav. Or build your own client from 1.1.x
branch and use it. In both cases you have to redo the merge, because
the problem is that your .svn/entries file contains an attribute
(copyfrom-url) which is not url-escaped.

BR, Jani

P.S. Your third option is that you do a (perl)script which will fix
those "copyfrom-url" attributes so that they are properly escaped.

If you decide to go this route, please remember: It is long and dark
journey and there are hidden dangers along your path. Moreover,
nobody will help you if you busted your working copy or _repository_,
so make backups. You are messing with the internals of SVN, so you
could drive SVN to burn your house or poison your pet. Be warned.

Jani Averbach 
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 5 14:06:38 2004

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

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