You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Didier Trosset <di...@agilent.com> on 2007/08/30 09:33:09 UTC
Commit fails to merge
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
Re: Commit fails to merge
Posted by Didier Trosset <di...@agilent.com>.
On Thu, 2007-08-30 at 11:33 +0200, Didier Trosset wrote:
> 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)
I finaly managed to find out where this was comming from. For the
record, I post it here.
It is due to the post-commit script. This later was returning non-0, and
sending some output on stderr. The 'MERGE failed' message was the output
of the failing command in the post-commit script. Also, as the script
was returning non-0, the client thought the commit failed, and didn't
update the working copy. Though the commit was succesful, as the error
apears only in the post-commit.
Didier
>
> 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