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

Commit fails to merge

From: Didier Trosset <didier_trosset_at_agilent.com>
Date: 2007-08-30 11:33:09 CEST

Hello,

I recently changed some settings in the configuration of the Apache
dav_svn module. I added the Require valid-user for all operations,
including read (GET, PROPFIND ...).

Since then, there are issues with commits:

  $ echo "" >> foobar.txt ; svn ci -m 'Testing commit.'
  Sending trunk/foobar.txt
  Transmitting file data .svn: Commit failed (details follow):
  svn: MERGE request failed on '/svn/Repository/trunk'
  svn: MERGE of '/svn/Repository/trunk': 200 OK (http://server)

The commit is successful (I mean the data is on the server, under a new
revision number) but an error is reported that a MERGE request failed.
Indeed, the working copy needs to be updated manually (svn up), after
the commit to have a correct status.

I tried removing/adding the SVNPathAuthz and AuthzSVNAccessFile but the
error is always present.

Any help welcome. Thanks

Didier

-- 
Didier Trosset-Moreau
Acqiris Operations
Agilent Technologies
Geneva, Switzerland
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 30 12:02:14 2007

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