[Critical] dirstate format use OS file locking

[Aaron Bentley]

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

John Arbash Meinel wrote:
> I did find a case where we have this happening, and I'm not positive
> what the best fix is. Specifically the merge code likes to open up new
> trees for 'this_tree', 'base_tree', and 'other_tree'. And they may be
> the same tree. (I specifically see examples where base_tree and
> this_tree are the same as part of the bundle tests).

Part of this is just Merger trying to support both high-level operations
and low-level ones at the same time.

> I think the more "correct" thing, is to have the merge code not opening
> up its own trees and branches, but instead have these things passed in
> from the higher level.

You can certainly supply base_tree and other_tree to the Merger
constructor.  But I'd rather supply base_tree at most and call
Merger.find_base() if needed.

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

iD8DBQFF8H060F+nu1YWqI0RAtYSAJ9yLb4AYT1+rX9nxaGlKSvvXt0S1wCdEWoO
t9AnxakrKfJdUEP1Wu2jeaA=
=QsCu
-----END PGP SIGNATURE-----