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

Re: Buglet in svn merge?

From: <kfogel_at_newton.ch.collab.net>
Date: 2003-01-27 16:23:24 CET

Sander Striker striker@apache.org writes:
 $ 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...

Yup. I think it's because in

   mod_dav_svn/update.c:dav_svn__update_report()

we send the update's closing XML tag unconditionally, even if
upd_set_target_revision() never sent the start tag. Will take a look
at it with Ben as soon as he's done recovering from his incoming mail
:-).

-K

 $ 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

---------------------------------------------------------------------
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:36 2006

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