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

Re: predecessor count for the root node-revision is wrong message

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 19 Mar 2012 09:48:24 +0000

Daniel Shahaf <danielsh_at_elego.de> writes:

>> From what is there so far, yes. We do have different operations
>> occurring at the same time, but for these ones, I see MERGE and DELETE
>> verbs overlapping in the same or near time intervals according to the
>> Apache logs. I just did a quick look in the Apache logs during a time
>> window where the bug wasn't triggered, and was able to see cases where
>> I have the following:
>> rev(x-1) merge
>> rev(x) merge
>> rev(x) delete
>> rev(x-1) delete
>>
>> This seems fine.
>> The case that I had seen in my reported cases are as follows:
>> rev(x-1) merge
>> rev(x) merge
>> rev(x-1) delete
>> rev(x) delete
>>
>
> I have tried forcing this sequence in the debugger, but that did not
> reproduce the bug.

[...]

> I conclude that the specific MERGE/MERGE/DELETE/DELETE order, by itself,
> is not sufficient to reproduce the bug.

DELETE is extremely unlikely to be involved in this bug. mod_dav_svn
maintains a mapping of DAV activity ID to Subversion transaction name in
the dav/ subdirectory of a repository. The dav/ subdirectory is not
part of the Subversion filesystem. DELETE is used to remove the mapping
for a particular activity ID and to remove the transaction if it still
exists. Following a successful MERGE the transaction will have been
converted into a revision so DELETE has no effect on the the Subversion
filesystem. DELETE will only affect the Subversion filesystem if called
before a successful MERGE, and that will cause any subsequent MERGE for
the activity to fail.

-- 
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com
Received on 2012-03-19 10:49:09 CET

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