[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: Tim Moloney <moloney_at_mrsl.com>
Date: 2002-03-11 19:17:08 CET

Ben Collins-Sussman wrote:

> Tim Moloney <moloney@mrsl.com> writes:
>
>> bash> svn commit
>> Adding /home/moloney/sandbox/example/dir1
>> Adding /home/moloney/sandbox/example/dir1/file1
>> Adding /home/moloney/sandbox/example/dir2
>> Adding /home/moloney/sandbox/example/dir2/file2
>> Adding /home/moloney/sandbox/example/dir3
>> Adding /home/moloney/sandbox/example/dir3/file3
>> Adding /home/moloney/sandbox/example/file1
>> Adding /home/moloney/sandbox/example/file2
>> Adding /home/moloney/sandbox/example/file3
>> Committed revision 1.
>> bash> cp ~/.bashrc file4
>> bash> svn add file4
>> A file4
>> bash> svn commit
>> Adding /home/moloney/sandbox/example/file4
>> Committed revision 2.
>> bash> svn remove file[24]
>> D file2
>> D file4
>> bash> svn commit
>> 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.

   bash> svn commit
   The commit message has been stored in this location:
   /home/moloney/sandbox/example/.svn/tmp/tempfile.62984.00002.tmp

   svn_error: #21071 : <Merge conflict during commit>
     commit failed: wc locks and tmpfiles have been removed.

   svn_error: #21071 : <Merge conflict during commit>
   commit failed: while sending tree-delta to repos.

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

   svn_error: #21071 : <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).

   bash> svn update
   A ./file2
   A ./file4
   bash> svn commit
   Deleting /home/moloney/sandbox/example/file2
   Deleting /home/moloney/sandbox/example/file4

   Committed revision 3.
   bash>

If it helps, Subversion is running on a fresh install of Red Hat 7.2
(autoconf updated to 2.52), neon is 0.19.3, BDB 4.0.14, and the latest
httpd-2.0, apr, and apr-util.

Let me know if you need any more info.

-- 
Tim Moloney
ManTech Real-time Systems Laboratory
2015 Cattlemen Road                             \     /
Sarasota, FL  34232                     .________\(O)/________.
(941) 377-6775 x208                        '  '  O(.)O  '  '
---------------------------------------------------------------------
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:19:06 2002

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