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

Re: undo commit of added "New Folder"?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-22 15:30:13 CET

On Mon, 2004-03-22 at 06:32, Jan Hendrik wrote:

> C:\>svn merge -r 317:316
> "http://192.168.0.3/svn/repos1/trunk/internet/Ridinger/New Folder" d
> :\internet\ridinger --dry-run
> svn: URL 'http://192.168.0.3/svn/repos1/trunk/internet/Ridinger/New
> Folder' is not properly URI-encoded

URLs can't have spaces in them. Use %20 instead.

>
> C:\>svn merge -r 317:316 "d:\internet\ridinger\New Folder"
> d:\internet\ridinger --dry-run
> svn: REPORT request failed on '/svn/repos1/!svn/vcc/default'
> svn: The REPORT request returned invalid XML in the response:
> XML parse error at line 1: no element found
> (/svn/repos1/!svn/vcc/default)

Now you're not even passing a URL! That's just a syntax error.

(And by the way, the unintelligible error message was fixed in
mod_dav_svn 1.0.1.)

>
> C:\>svn merge --dry-run -r 317:316
> http://dim4300/svn/repos1/trunk/internet/Ridinger/New%20Folder
> d:\internet\ridinger
> svn: REPORT request failed on '/svn/repos1/!svn/vcc/default'
> svn: The REPORT request returned invalid XML in the response:
> XML parse error at line 1: no element found
> (/svn/repos1/!svn/vcc/default)

Same cryptic error that was fixed in 1.0.1: what the error really
should be saying is "That folder doesn't exist in revision 317."

You're asking svn to compare a certain path in two trees, but it doesn't
exist in the r317 tree.

The answer is to compare the *parent* directory in r317 with the parent
directory in r316, and to apply the merge to the parent directory in
your working copy.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Mar 22 15:31:50 2004

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