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

Mysterious MERGE error on commit operation with status 200

From: David.Trombley <David.Trombley_at_noaa.gov>
Date: 2007-04-30 19:31:49 CEST

   Hello all!

   I've seen two previous recent posts about this problem - the symptom
is that a commit succeeds in the backend,
however the client returns the following error:

Transmitting file data .svn: Commit failed (details follow):
svn: MERGE request failed on '/usr/svn/.NEWS'
svn: MERGE of '/usr/svn/.NEWS': 200 OK (http:/[redacted])

   And then the local copy must be updated to reflect the new revision.
I couldn't find any successful workaround here,
it appears the repository gets into this state and this behavior
continues reliably. I can't find any outstanding tracked issues
that seem to relate to this.

   Has anybody else seen this? What diagnostics can I do to determine
if this is a bug?

[svn@[redacted] libsvn_ra_dav]$ svn --version
svn, version 1.4.3 (r23084)
   compiled Apr 24 2007, 15:00:25

Copyright (C) 2000-2006 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
  - handles 'http' scheme
  - handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme




To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 30 19:32:07 2007

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