You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Lele Gaifax <le...@nautilus.homeip.net> on 2004/03/15 01:02:29 UTC
Fatal error on commit, after a merge
Hi,
I'm receiving the following error, trying to commit a wc after a few
merges:
svn: Commit failed (details follow):
svn: PROPFIND request failed on '/progetti/3rd/plone/2.0/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor Manual v1.0_files'
svn: PROPFIND of '/progetti/3rd/plone/2.0/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor Manual v1.0_files': 400 Bad Request (http://svnserver)
The problem seems raised by an improper copyfrom-url withing that
directory (and belows). Notice how the latest component of that path
contains spaces: examining the .svn/entries file, I found the
following
<?xml version="1.0" encoding="utf-8"?>
<wc-entries
xmlns="svn:">
<entry
name=""
url="http://svnserver/progetti/wip/AdL/www/zope/Products/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor%20Manual%20v1.0_files"
copied="true"
kind="dir"
copyfrom-rev="459"
schedule="add"
revision="459"
copyfrom-url="http://svnserver/progetti/3rd/plone/2.0/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor Manual v1.0_files"/>
<entry
name="CVS"
copied="true"
kind="dir"
copyfrom-rev="459"
schedule="add"
copyfrom-url="http://svnserver/progetti/3rd/plone/2.0/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor Manual v1.0_files/CVS"/>
</wc-entries>
As said, that new entries was created by a previous
$ svn merge -rX:HEAD http://svnserver/.../plone/2.0/CMFPlone CMFPlone
I manually fixed the copyfrom-url in the few entries files withing
that dir and below, replacing the space with %20, and it worked! After
that, this is now the content of the same entries, that seems ok.
<?xml version="1.0" encoding="utf-8"?>
<wc-entries
xmlns="svn:">
<entry
committed-rev="461"
name=""
committed-date="2004-03-15T00:43:02.462250Z"
url="http://svnserver/progetti/wip/AdL/www/zope/Products/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor%20Manual%20v1.0_files"
last-author="lele"
kind="dir"
revision="461"/>
<entry
name="CVS"
kind="dir"
copyfrom-rev="459"
copyfrom-url="http://svnserver/progetti/3rd/plone/2.0/CMFPlone/skins/plone_3rdParty/XS/Docs/XS-DHEditor%20Manual%20v1.0_files/CVS"/>
</wc-entries>
$ svn --version
svn, version 1.1.0 (dev build)
compiled Mar 3 2004, 01:50:32
while the server on the other end is an official 1.0 (debian sid).
hth,
ciao, lele.
--
nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia.
email: lele@seldati.it | -- Fortunato Depero, 1929.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Fatal error on commit, after a merge
Posted by Lele Gaifax <le...@nautilus.homeip.net>.
>>>>> "Lele" == Lele Gaifax <le...@nautilus.homeip.net> writes:
Lele> $ svn --version svn, version 1.1.0 (dev build) compiled Mar
Lele> 3 2004, 01:50:32
I rechecked using today's trunk, and while I wasn't able to retrigger
the problem on a local repos, redoing conceptually the same
operations, ie
$ svn co -r 370 http://svnserver/3rd/plone wc
$ svn merge -r 370:HEAD http://svnserver/3rd/plone wc
the product/.../.svn/entries contains this snippet:
<?xml version="1.0" encoding="utf-8"?>
<wc-entries
xmlns="svn:">
<entry
name=""
url="http://svnserver/3rd/plone/skins/plone_3rdParty/XS/Docs/XS-DHEditor%20Manual%20v1.0_files"
copied="true"
kind="dir"
copyfrom-rev="463"
schedule="add"
revision="463"
copyfrom-url="http://svnserver/3rd/plone/skins/plone_3rdParty/XS/Docs/XS-DHEditor Manual v1.0_files"/>
I'm sorry but I cannot retest the commit, that yesterday failed in a
similar situation. Anyway, shouldn't copyfrom-url be properly escaped
too?
thanx&bye,
lele.
--
nickname: Lele Gaifax | Quando vivrò di quello che ho pensato ieri
real: Emanuele Gaifas | comincerò ad aver paura di chi mi copia.
email: lele@seldati.it | -- Fortunato Depero, 1929.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org