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

Re: Unnecessary conflicts?

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2002-03-11 19:48:07 CET

Tim Moloney <moloney@mrsl.com> writes:

> >> The commit message has been stored in this location:
> >> /home/moloney/sandbox/example/.svn/tmp/tempfile.62968.00001.tmp
> >>
> >> apr_error: #20014, src_err 0 : <Error string not specified yet>
> >> commit failed: wc locks and tmpfiles have been removed.
> >>
> >> apr_error: #20014, src_err 0 : <Error string not specified yet>
> >> commit failed: while sending tree-delta to repos.
> >>
> >> apr_error: #20014, src_err 0 : <Error string not specified yet>
> >> CHECKOUT of /svn/example/$svn/ver/0.0/ returned status code 409
> >> (Conflict)
> >>
> > Tim, I can't reproduce this problem. Can you rebuild today's latest
>
> > httpd, apr, apr-util, and svn (r1459+), and tell us if it still
> > happens for you?
>
>
> Sorry for the delay in replying. I was fortunate to have Friday off.
>
> I checked out the latest httpd-2.0, apr, and apr-util (as of 12:30
> today) and grabbed Subversion revision 1482. I still have the same
> problem but the error messages are much improved.

I can reproduce this using ra_dav, but it doesn't occur using
ra_local. Two commits followed by a delete, with no intervening
updates are required:

$ svnadmin create repo
$ svn co http://localhost:8888/repo -d wc
$ echo foo > wc/foo
$ svn add wc/foo
A wc/foo
$ svn ci -m "" wc
Adding wc/foo
Transmitting file data .
Committed revision 1.
$ echo bar > wc/bar
$ svn add wc/bar
A wc/bar
$ svn ci -m "" wc
Adding wc/bar
Transmitting file data .
Committed revision 2.
$ svn rm wc/foo wc/bar
D wc/foo
D wc/bar
$ svn ci -m "" wc

../svn/subversion/libsvn_wc/adm_crawler.c:2010
apr_error: #20014, src_err 0 : <Error string not specified yet>
  commit failed: wc locks and tmpfiles have been removed.

../svn/subversion/libsvn_wc/adm_crawler.c:1572
apr_error: #20014, src_err 0 : <Error string not specified yet>
  commit failed: while sending tree-delta to repos.

../svn/subversion/libsvn_ra_dav/util.c:388
apr_error: #20014, src_err 0 : <Error string not specified yet>
  CHECKOUT of /repo/$svn/ver/0.0/ returned status code 409 (Conflict)

The apache error log contains

[Mon Mar 11 18:36:22 2002] [error] [client 127.0.0.1] Could not CHECKOUT resource /repo/$svn/ver/0.0/. [409, #0]
[Mon Mar 11 18:36:22 2002] [error] [client 127.0.0.1] (2)No such file or directory: 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). [409, #21071]

There is a transaction remaining

$ svnadmin lstxns repo
2
$ svnlook repo txn 2
anonymous

0

/
 foo
 bar

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 11 19:48:59 2002

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