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

Commit fails over ra_dav but not ra_local

From: Blair Zajac <blair_at_orcaware.com>
Date: 2002-06-20 03:17:08 CEST

Just opened issue #758 for this:
http://subversion.tigris.org/issues/show_bug.cgi?id=758

Unlike the previous sequence, this one has plenty of commits in
it to handle the svn mv's.

This sequence fails over ra_dav but not using ra_local, which
suggests that there's a real problem here. The repos here is
an empty repos.

svn co http://svn.orcaware.com:8000/repos
cd repos
svn mkdir 1
touch 1/1
svn add 1/1
svn ci -F /dev/null
svn mv 1 2
svn ci -F /dev/null
cp /etc/group 2/1
touch 2/2
svn add 2/2
svn ci -F /dev/null
Sending 2/1

svn_error: #21078 : <Merge conflict during commit>
  Commit failed (details follow):

svn_error: #21078 : <Merge conflict during commit>
  Your file '1' is probably out-of-date.

svn_error: #21078 : <Merge conflict during commit>

The version resource does not correspond to the resource within the
transaction. Either the requested version resource is out of date
(needs to be updated), or the requested version resource is newer
than the transaction root (restart the commit).

Blair

-- 
Blair Zajac <blair@orcaware.com>
Web and OS performance plots - http://www.orcaware.com/orca/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 20 03:17:39 2002

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.