I get the same error when I try the merge locally:
ross_at_iron:~/peter/R/earlyCutoff$ svn merge
http://localhost/svn/mspath/trunk
svn: REPORT of '/svn/!svn/bc/1180/mspath/trunk': 200 OK
(http://localhost)
I had just created the directory with
ross_at_iron:~/peter/R$ svn co
http://localhost/svn/mspath/branches/earlyCutoff
The apache logs show
[Wed Mar 18 14:54:41 2009] [error] [client 127.0.0.1] Provider encountered an error while streaming a REPORT response. [501, #0]
[Wed Mar 18 14:54:41 2009] [error] [client 127.0.0.1] Error writing REPORT response. [501, #200007]
[Wed Mar 18 14:54:41 2009] [error] [client 127.0.0.1] The 'node-origins' feature requires version 3 of the filesystem schema; filesystem '/usr/local/var/svnrepos/db' uses only version 1 [501, #200007]
Huh?
On Wed, 2009-03-18 at 12:42 -0700, Ross Boylan wrote:
> $ svn merge http://localhost:8000/svn/mspath/trunk
> svn: REPORT of '/svn/!svn/bc/1180/mspath/trunk': 200 OK
> (http://localhost:8000)
> And nothing seems to have happened. snv:mergeinfo is empty
> (non-existent?) and svn diff shows nothing.
>
> Can anyone help me to figure out what is going on and how I can fix it?
> I've seen some previous discussion of similar errors, but a) they
> concerns commits and b) they mention case sensitivity. I'm running
> Linux on both ends.
>
> At the most basic level, what does the message I get back mean? It
> doesn't announce itself as an error; in fact it says OK, But something
> has gone wrong.
>
> Thanks.
> Ross
>
> Background info:
> The repository is on a remote host; localhost:8000 port forwards to it
> via ssh. The remote host is subversion under Apache.
>
> I executed the merge command from the root directory of a branch.
>
> Previously, while on the branch, I merged in some changes from the
> trunk. This merger actually backed out some changes; there were some
> conflicts I had to resolve before I committed the alterations to the
> branch.
>
> Both systems are Debian Gnu/Linux Lenny, 32bit Intel architecture
> (client is P4, server is AMD Athlon).
> subversion 1.5.1dfsg1-2
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1350334
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
--
Ross Boylan wk: (415) 514-8146
185 Berry St #5700 ross_at_biostat.ucsf.edu
Dept of Epidemiology and Biostatistics fax: (415) 514-8150
University of California, San Francisco
San Francisco, CA 94107-1739 hm: (415) 550-1062
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1350986
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-18 23:01:29 CET