You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by matled <ma...@uni.de> on 2003/11/18 15:20:14 UTC
Conflict error after second modify commit
Hello,
When I try to commit a second modification I recieven an error
message. The commands I ran are here (http://nopaste.php-q.net/23307)
and a tcpdump is here (http://matled.ath.cx/dump.bz2). I am sure that
there was no-one commiting while I did this. The only way I found out
to solve this is to remove the working copy and check it out again.
Subversion is installed from the FreeBSD ports and running with
apache2. Here are some information of my system:
$ uname -a
FreeBSD lumbie.lan 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Thu Nov
6 13:16:16 CET 2003
matled@lumbie.lan:/usr/src/sys/i386/compile/LUMBIE i386
$ svn --version
svn, version 0.32.1 (r7497)
compiled Nov 13 2003, 19:17:51
Copyright (C) 2000-2003 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
The following repository access (RA) modules are available:
* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
- handles 'http' schema
- handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
- handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network protocol.
- handles 'svn' schema
$ httpd -v
Server version: Apache/2.0.48
Server built: Nov 16 2003 12:31:14
Matthias Lederhofer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Conflict error after second modify commit
Posted by Matthias Lederhofer <ma...@uni.de>.
I just played around a little bit and was abled to localize the
problem further. It only appears with apache (not tested on apache1,
just apache2) if there is a Location-directive inside a
Virtualhost-Directive. Example:
<VirtualHost *>
ServerName test.svn.lan
<Location />
DAV svn
SVNPath /home/svn/repos/test/
</Location>
</VirtualHost>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org