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

Re: Advice Needed: Merging Branch back into Trunk

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-01 23:06:24 CEST

"Richard In Public" <edification@blueyonder.co.uk> writes:

> Run from within the checked out trunk svn merge -r 33:HEAD
> http://europad/svn/henrys-brown-boxes/branches/hostway .
>
> responds with:
>
> svn: RA layer request failed
> svn: REPORT request failed on '/svn/henrys-brown-boxes/branches/hostway'
> svn: The REPORT request returned invalid XML in the response: Unknown XML
> element `error (in DAV:)'. (/svn/henrys-brown-boxes/branches/hostway)

No, I think the immediate problem here is issue #1201: "200 httpd
response contains <error> in body".
 
> I suspect that this is because revision 33 was created with an earlier
> version of SVN. This seems to be confirmed by the fact that this command
> works if I use substitute version 55 for version 33.
>
> Instructions in The Guide (which I've just reread) require that the old
> repository is exported with the earlier version of SVN. Unfortunately, I
> ahven't been doing so so my repository has been modified by quite a few SVN
> versions. Is there any way of recovering from this problem?

Um, svn clients don't affect the format of the repository. When the
repository db schema changes, you'll definitely know: you're forced
to do a dump/reload of all data.

I think the problem here is that the path /svn/.../branches/hostway
doesn't exist in revision 33. Is that the case?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 1 23:07:29 2003

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