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

Re: Mysterious MERGE error on commit operation with status 200

From: Tom Mornini <tmornini_at_infomania.com>
Date: 2007-05-01 21:08:08 CEST

On Apr 30, 2007, at 10:31 AM, David.Trombley wrote:

> 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?

Hello David.

We've seen these exact errors on 1.4.3.

The only way we've been able to fix it is to work in a working copy
that was checked out below the root of the repository.

Please let me know if this helps you out.


-- Tom Mornini, CTO
-- Engine Yard, Ruby on Rails Hosting
-- Support, Scalability, Reliability
-- (866) 518-YARD (9273)
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 1 21:08:50 2007

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.