[BUG] Pull command on Windows: we have 2 problems

[Aaron Bentley]

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

John A Meinel wrote:
> Aaron Bentley wrote:
> I think switching that to making Locks singletons is fine, as long as
> the Branch.lock_* interface is capable of figuring out what the current
> lock state of a branch is.

I don't think that's necessary.  Branch.lock_read can be a wrapper of
Branch.lock.lock_read, which would have the current locking code.

>>But the attached patch will probably fix it.
> 
> 
> This patch should probably be applied, as well as creating
> LocationLocks. 

I've been improving the merge code, but mainline is about a week out of
date with me.  It looks like my code already doesn't have this bug.

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

iD8DBQFDX/D60F+nu1YWqI0RAkF1AKCE021T23d5SiWXS3dX/pUhnpYsTQCfYupu
+hNBttx0jY8aXbXf8lDpK7s=
=IJ30
-----END PGP SIGNATURE-----