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

merge fails on port forwarded repository

From: Ross Boylan <ross_at_biostat.ucsf.edu>
Date: Wed, 18 Mar 2009 12:42:09 -0700

$ svn merge http://localhost:8000/svn/mspath/trunk
svn: REPORT of '/svn/!svn/bc/1180/mspath/trunk': 200 OK
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.


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

Both systems are Debian Gnu/Linux Lenny, 32bit Intel architecture
(client is P4, server is AMD Athlon).
subversion 1.5.1dfsg1-2


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-18 20:43:20 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.