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

Conflict error after second modify commit

From: matled <matled_at_uni.de>
Date: 2003-11-18 16:20:14 CET


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
Received on Tue Nov 18 17:08:50 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.