You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Dan Cristian <Da...@ags.ro> on 2006/02/01 17:08:41 UTC
Commit error (Could not MERGE, 409 Conflict)

I'm using apache 2.2.0 binaries from www.apachelounge.com,
mod_dav_svn.so & mod_authz_svn.so compiled by myself from SVN 1.3.0
sources & apache 2.2.0 sources.

I'm trying to do a commit via SVN DAV with several clients (SmartSVN,
tortoiseSVN) but I get the following error (with TortoiseSVN):
Error: Commit failed (details follow):
Error: MERGE request failed on '/repos2'
Error: Can't move 'C:\SVN_Repo2\db\transactions\0-1.txn\rev' to
'C:\SVN_Repo2\db\revs\1': Partial results are valid but processing is
incomplete  

The SVN repository is empty, created with svnadmin create. Checkout
works fine.
Could you let me know what the problem is? 

=== Error.log content ===
[Wed Feb 01 18:36:17 2006] [error] [client 192.168.0.150] Could not
MERGE resource "/repos2/!svn/act/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01"
into "/repos2".  [409, #0]
[Wed Feb 01 18:36:17 2006] [error] [client 192.168.0.150] An error
occurred while committing the transaction.  [409, #70008]
[Wed Feb 01 18:36:17 2006] [error] [client 192.168.0.150] Can't move
'C:\\SVN_Repo2\\db\\transactions\\0-1.txn\\rev' to
'C:\\SVN_Repo2\\db\\revs\\1': Partial results are valid but processing
is incomplete  [409, #70008]

=== Access.log content ===
192.168.0.150 - - [01/Feb/2006:18:36:16 +0200] "OPTIONS /repos2
HTTP/1.1" 401 401
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "OPTIONS /repos2
HTTP/1.1" 200 186
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "MKACTIVITY
/repos2/!svn/act/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01 HTTP/1.1" 201 225
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPFIND /repos2
HTTP/1.1" 207 428
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPFIND
/repos2/!svn/vcc/default HTTP/1.1" 207 394
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "CHECKOUT
/repos2/!svn/bln/0 HTTP/1.1" 201 239
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPPATCH
/repos2/!svn/wbl/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01/0 HTTP/1.1" 207
351
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPFIND /repos2
HTTP/1.1" 207 379
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "CHECKOUT
/repos2/!svn/ver/0/ HTTP/1.1" 201 238
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPFIND
/repos2/test_file.txt HTTP/1.1" 404 218
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PUT
/repos2/!svn/wrk/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01/test_file.txt
HTTP/1.1" 201 239
192.168.0.150 - dan [01/Feb/2006:18:36:16 +0200] "PROPPATCH
/repos2/!svn/wrk/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01/test_file.txt
HTTP/1.1" 207 476
192.168.0.150 - dan [01/Feb/2006:18:36:17 +0200] "MERGE /repos2
HTTP/1.1" 409 332
192.168.0.150 - dan [01/Feb/2006:18:36:17 +0200] "DELETE
/repos2/!svn/act/312b4b8f-009f-6f44-b3d4-3e3dbf94cd01 HTTP/1.1" 204 -

=== Conf SVN Location ===
<Location /repos2> 
	DAV svn 
	SVNPath C:/SVN_Repo2
	SVNAutoversioning on
        AuthType SSPI 
        SSPIAuth On 
        SSPIAuthoritative On 
        SSPIDomain ALFA
        SSPIOfferBasic On 
        SSPIOmitDomain On 
	AuthName "Subversion repository" 
        AuthzSVNAccessFile c:/SVN_REPO/conf/acl.conf
	Require valid-user         
</Location>

Thanks in advance!
Dan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org