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

Re: svn merge fails with "invalid XML"

From: Justin Erenkrantz <jerenkrantz_at_apache.org>
Date: 2002-08-21 09:34:46 CEST

On Wed, Aug 21, 2002 at 01:57:22AM -0500, cmpilato@collab.net wrote:
> Sure, this is easy.

Okay, subversion/mod_dav_svn/update.c:813 has:

/* Now close the report body completely. */
send_xml(&uc, "</S:update-report>" DEBUG_CR);

An update-report section was never generated (uc.bb is empty), but
it decides to add this to the response. Oops.

I'll try to hunt around, but one fix might be:

if (!APR_BRIGADE_EMPTY(uc.bb)) {
  /* Now close the report body completely. */
  send_xml(&uc, "</S:update-report>" DEBUG_CR);

Let me see if this is even the right thing to do. That smells more
like a workaround than the real fix. -- justin

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 21 09:35:33 2002

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

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