[patch] change WorkingTree to use LockDir

Martin Pool mbp at sourcefrog.net
Thu Mar 9 03:41:46 GMT 2006


On 9 Mar 2006, at 14:33 , Robert Collins wrote:

> On Thu, 2006-03-09 at 14:28 +1100, Martin Pool wrote:
>>
>>  class WorkingTreeFormat3(WorkingTreeFormat):
>>      """The second working tree format updated to record a format
>> marker.
>>
>> -    This format modified the hash cache from the format 1 hash  
>> cache.
>> +    This format:
>> +        - exists within a metadir controlling .bzr
>> +        - includes an explicit version marker for the workingtree
>> control
>> +          files, separate from the BzrDir format
>> +        - modifies the hash cache format
>> +        - is new in bzr 0.8
>> +        - uses a LockDir to guard access to the repository
>
> +1.
>
> I think there was copy n paste namae from me there: the hash cache
> format in format3 trees is the same as format2. Format2 changed it  
> from
> format1 (which we no longer read).

For some reason, with this change in place bzr upgrade produces the  
wrong kind of lock file in the result, though bzr init gets the right  
thing.   Maybe this is because it's doing an upgrade in place?  Just  
need to track that down - newly created branches seem to do the right  
thing.

-- 
Martin Pool







More information about the bazaar mailing list