You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bill Comisky <bc...@pobox.com> on 2003/06/11 19:38:01 UTC
error using 'svn merge' with ra_dav
I was trying to use 'svn merge' to undo some changes to my working copy,
so I could then commit them and effectively make my HEAD the same as an
older revision.
I got an error using ra_dav that I don't see using ra_local, involving a
file that is moved using 'svn move'. I'm using revision 6186 of
subversion, with Apache 2.0.46. I'm new to subversion, so please let me
know if I've obviously screwed up or perhaps my Apache configuration is
incorrect.
Below is a transcript of an example that demonstrates the problem, first
using ra_local, then ra_dav:
$ # ---------------- using ra_local --------------------------------
$ svnadmin create /usr/local/svn/repos1
$ mkdir repos1
$ cd repos1
$ echo 'hello' > foo
$ svn import -m '' file:///usr/local/svn/repos1
Adding foo
Committed revision 1.
$ cd ..
$ svn checkout file:///usr/local/svn/repos1 wc
A wc/foo
Checked out revision 1.
$ cd wc
$ svn mkdir -m '' file:///usr/local/svn/repos1/trunk
Committed revision 2.
$ svn update
A trunk
Updated to revision 2.
$ svn move foo trunk
A trunk/foo
D foo
$ svn commit -m 'moved foo to /trunk'
Deleting foo
Adding trunk/foo
Committed revision 3.
$ svn update
At revision 3.
$ svn merge -r HEAD:2 file:///usr/local/svn/repos1
D trunk/foo
D trunk/foo
A foo
$ svn status
A + foo
D trunk/foo
$ ls -1R
.:
foo
trunk
./trunk:
$ # ---------------- now using ra_dav --------------------------------
$ rm -rf /usr/local/svn/repos1 repos1 wc
$ svnadmin create /usr/local/svn/repos1
$ mkdir repos1
$ cd repos1
$ echo 'hello' > foo
$ svn import -m '' http://YOUR_SVNSERVER/svn/repos1
Adding foo
Committed revision 1.
$ cd ..
$ svn checkout http://YOUR_SVNSERVER/svn/repos1 wc
A wc/foo
Checked out revision 1.
$ cd wc
$ svn mkdir -m '' http://YOUR_SVNSERVER/svn/repos1/trunk
Committed revision 2.
$ svn update
A trunk
Updated to revision 2.
$ svn move foo trunk
A trunk/foo
D foo
$ svn commit -m 'moved foo to /trunk'
Deleting foo
Adding trunk/foo
Committed revision 3.
$ svn update
At revision 3.
$ svn merge -r HEAD:2 http://YOUR_SVNSERVER/svn/repos1
svn: RA layer request failed
svn: PROPFIND request failed on 'http://YOUR_SVNSERVER/svn/repos1/foo'
svn: PROPFIND of 'http://YOUR_SVNSERVER/svn/repos1/foo': 404 Not Found (http://YOUR_SVNSERVER)
D trunk/foo
D trunk/foo
$ svn status
D trunk/foo
$ ls -1R
.:
trunk
./trunk:
$ # --------------------- done ----------------------------
--
Bill Comisky
bcomisky@pobox.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: error using 'svn merge' with ra_dav
Posted by Bill Comisky <bc...@pobox.com>.
I checked my httpd logs and noticed that after a long string of "PROPFIND
/svn/repos1/" lines it ends with "PROPFIND http://YOUR_SVNSERVER/..."
line which looked kind of suspicious:
10.0.0.30 - root [11/Jun/2003:14:46:27 -0500] "PROPFIND
/svn/repos1/!svn/bc/2/foo HTTP/1.1" 207 513 "-" "neon/0.23.9
SVN/0.23.0
(dev build)"
10.0.0.30 - root [11/Jun/2003:14:46:27 -0500] "PROPFIND
http://YOUR_SVNSERVER/svn/repos1/foo HTTP/1.1" 404 417 "-" "neon/0.23.9
SVN/0.23.0 (dev build)"
On Wed, 11 Jun 2003, Bill Comisky wrote:
>
> I was trying to use 'svn merge' to undo some changes to my working copy,
> so I could then commit them and effectively make my HEAD the same as an
> older revision.
>
> I got an error using ra_dav that I don't see using ra_local, involving a
> file that is moved using 'svn move'. I'm using revision 6186 of
> subversion, with Apache 2.0.46. I'm new to subversion, so please let me
> know if I've obviously screwed up or perhaps my Apache configuration is
> incorrect.
>
> Below is a transcript of an example that demonstrates the problem, first
> using ra_local, then ra_dav:
>
> $ # ---------------- using ra_local --------------------------------
> $ svnadmin create /usr/local/svn/repos1
> $ mkdir repos1
> $ cd repos1
> $ echo 'hello' > foo
> $ svn import -m '' file:///usr/local/svn/repos1
> Adding foo
>
> Committed revision 1.
> $ cd ..
> $ svn checkout file:///usr/local/svn/repos1 wc
> A wc/foo
> Checked out revision 1.
>
> $ cd wc
> $ svn mkdir -m '' file:///usr/local/svn/repos1/trunk
>
> Committed revision 2.
> $ svn update
> A trunk
> Updated to revision 2.
> $ svn move foo trunk
> A trunk/foo
> D foo
> $ svn commit -m 'moved foo to /trunk'
> Deleting foo
> Adding trunk/foo
>
> Committed revision 3.
> $ svn update
> At revision 3.
> $ svn merge -r HEAD:2 file:///usr/local/svn/repos1
> D trunk/foo
> D trunk/foo
> A foo
> $ svn status
> A + foo
> D trunk/foo
> $ ls -1R
> .:
> foo
> trunk
>
> ./trunk:
>
>
> $ # ---------------- now using ra_dav --------------------------------
> $ rm -rf /usr/local/svn/repos1 repos1 wc
> $ svnadmin create /usr/local/svn/repos1
> $ mkdir repos1
> $ cd repos1
> $ echo 'hello' > foo
> $ svn import -m '' http://YOUR_SVNSERVER/svn/repos1
> Adding foo
>
> Committed revision 1.
> $ cd ..
> $ svn checkout http://YOUR_SVNSERVER/svn/repos1 wc
> A wc/foo
> Checked out revision 1.
> $ cd wc
> $ svn mkdir -m '' http://YOUR_SVNSERVER/svn/repos1/trunk
>
> Committed revision 2.
> $ svn update
> A trunk
> Updated to revision 2.
> $ svn move foo trunk
> A trunk/foo
> D foo
> $ svn commit -m 'moved foo to /trunk'
> Deleting foo
> Adding trunk/foo
>
> Committed revision 3.
> $ svn update
> At revision 3.
> $ svn merge -r HEAD:2 http://YOUR_SVNSERVER/svn/repos1
> svn: RA layer request failed
> svn: PROPFIND request failed on 'http://YOUR_SVNSERVER/svn/repos1/foo'
> svn: PROPFIND of 'http://YOUR_SVNSERVER/svn/repos1/foo': 404 Not Found (http://YOUR_SVNSERVER)
> D trunk/foo
> D trunk/foo
> $ svn status
> D trunk/foo
> $ ls -1R
> .:
> trunk
>
> ./trunk:
>
> $ # --------------------- done ----------------------------
>
>
--
Bill Comisky
bcomisky@pobox.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org