[MERGE REVIEW] win32 tests

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Aaron Bentley пишет:

>> === modified file 'a/bzrlib/builtins.py'
>> --- a/bzrlib/builtins.py   
>> +++ b/bzrlib/builtins.py   
>> @@ -2049,9 +2049,11 @@
>>                  raise BzrCommandError("No missing location known or
>> specified.")
>>              print "Using last location: " + local_branch.get_parent()
>>          remote_branch = bzrlib.branch.Branch.open(other_branch)
>> -        remote_branch.lock_read()
>> +        local_branch.lock_write()
>> +        if remote_branch.base == local_branch.base:
>> +            remote_branch = local_branch
>>          try:
>> -            local_branch.lock_write()
>> +            remote_branch.lock_read()
>>              try:
>>                  local_extra, remote_extra =
>> find_unmerged(local_branch, remote_branch)
>>                  if (log_format == None):
> 
> 
> This part of your patch refer to item 6 (above)? I think this is not
> win32-specific. But anyway +0.

It's been a couple of weeks, but I'm pretty sure this fixed tests that
were failing otherwise.  The old issue that win32 can't lock something
twice and POSIX can.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEKBPE0F+nu1YWqI0RAl1RAJ9/g6QwT9GeoqMwge/Ub1rQIq5oqACeIZLc
U7kj52/Ve1PPEYW9e1iBNEU=
=xq5q
-----END PGP SIGNATURE-----