You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Gary Thomas <ga...@mlbassoc.com> on 2004/12/03 23:19:28 UTC
%file unwise?
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:
svn: Commit failed (details follow):
svn: PROPFIND request failed on '/SVN/branches/rev1-branch/develop/tests/%meta'
svn: PROPFIND of '/SVN/branches/rev1-branch/tests/%meta': 400 Bad Request (http://www.mlbassoc.com)
When I did 'svn info' on that file in my WC, I got strange results:
[gthomas@hermes packages]$ svn info tests/%meta
Path: tests/%meta
Name: %meta
URL: http://www.mlbassoc.com/SVN/rev2-branch/tests/%25meta
Revision: 0
Node Kind: file
Schedule: add
Copied From URL: http://www.mlbassoc.com/SVN/branches/rev1-branch/tests/%meta
Copied From Rev: 673
Text Last Updated: 2004-12-03 07:50:39 -0700 (Fri, 03 Dec 2004)
Properties Last Updated: 2004-12-03 07:50:39 -0700 (Fri, 03 Dec 2004)
Checksum: 2ef612bdd84a23656b59e1a730d7a7f8
Should I just rename all of my %meta files to something else (and change the
tools & scripts that use them :-()?
--
Gary Thomas <ga...@mlbassoc.com>
MLB Associates
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: %file unwise?
Posted by Jani Averbach <ja...@jaa.iki.fi>.
On 2004-12-05 07:44-0700, Gary Thomas wrote:
> On Sun, 2004-12-05 at 06:04, Jani Averbach wrote:
> > The good news is that this is fixed, and should be in 1.1.2 when it
> > will be released.
>
> Any idea/schedule when that might be?
No, but I might say that it will happen more likely in the near than
distant future.
>
> Could I just edit the one .svn/entries entry that's messed up (by hand)?
>
Yes you can, the encoding is normal URL escaping, but remember what I
said about your house and pet. =) Make backups.
BR, Jani
--
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: %file unwise?
Posted by Gary Thomas <ga...@mlbassoc.com>.
On Sun, 2004-12-05 at 06:04, Jani Averbach wrote:
> 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:
> http://subversion.tigris.org/issues/show_bug.cgi?id=1905
>
> The good news is that this is fixed, and should be in 1.1.2 when it
> will be released.
Any idea/schedule when that might be?
>
> 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.
Could I just edit the one .svn/entries entry that's messed up (by hand)?
>
> 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.
Isn't this a standard PERL disclaimer? (I'm a Python person :-)
Thanks for any assistance
--
Gary Thomas <ga...@mlbassoc.com>
MLB Associates
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: %file unwise?
Posted by Jani Averbach <ja...@jaa.iki.fi>.
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:
http://subversion.tigris.org/issues/show_bug.cgi?id=1905
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
Re: %file unwise?
Posted by kf...@collab.net.
Gary Thomas <ga...@mlbassoc.com> writes:
> 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:
>
> svn: Commit failed (details follow):
> svn: PROPFIND request failed on '/SVN/branches/rev1-branch/develop/tests/%meta'
> svn: PROPFIND of '/SVN/branches/rev1-branch/tests/%meta': 400 Bad Request (http://www.mlbassoc.com)
>
> When I did 'svn info' on that file in my WC, I got strange results:
>
> [gthomas@hermes packages]$ svn info tests/%meta
> Path: tests/%meta
> Name: %meta
> URL: http://www.mlbassoc.com/SVN/rev2-branch/tests/%25meta
> Revision: 0
> Node Kind: file
> Schedule: add
> Copied From URL: http://www.mlbassoc.com/SVN/branches/rev1-branch/tests/%meta
> Copied From Rev: 673
> Text Last Updated: 2004-12-03 07:50:39 -0700 (Fri, 03 Dec 2004)
> Properties Last Updated: 2004-12-03 07:50:39 -0700 (Fri, 03 Dec 2004)
> Checksum: 2ef612bdd84a23656b59e1a730d7a7f8
Can you show us the merge command? Is the repository public?
(Is the "strange" thing the absence of the "branches/" component in the
URL shown in the 'svn info' output above?)
> Should I just rename all of my %meta files to something else (and change the
> tools & scripts that use them :-()?
I think % should be fine. But it's hard to tell whether this problem
is in the cvs2svn conversion, or in the merge, or in the commit of the
merge. We're going to need to be able to reproduce it. Knowing the
merge command and its results will help. We need insane amounts of
detail :-). A transcript would be perfect.
(Oh, are you using cvs2svn? And if not, how are you converting?)
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org