Buglet in svn merge?

Hi,

To do what I did in rev 4605 I first tried (from the top
of my working copy):

$ svn merge -r 4603:4602 subversion/libsvn_delta/diff_file.c
subversion/libsvn_ra_dav/util.c:350: (apr_err=175002)
svn: RA layer request failed
svn: REPORT request failed on /repos/svn/trunk/subversion/libsvn_delta/diff_file.c
subversion/libsvn_ra_dav/util.c:335: (apr_err=175002)
svn: The REPORT request returned invalid XML in the response: XML parse error at line 1: xmlParseStartTag: invalid element name
.. (/repos/svn/trunk/subversion/libsvn_delta/diff_file.c)

That clearly didn't work...

$ svn diff -r 4603:4602 subversion/libsvn_delta/diff_file.c | patch -p0

did the trick however.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 14 02:19:15 2006