[Merge] Two Phase Locking

[John Arbash Meinel]

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

Martin Pool wrote:
> On  7 Jul 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:

...

> 
> Oh, right - yes, I meant that the order you chose is fine, but thinking
> of it as "lower before higher" may help in more cases than "other before
> self".

Sure.


...

>> Are you happy enough with tests/LockHelpers.py that I can merge it? Or
>> do you want to me to hold off?
> 
> tests/lock_helpers.py would be OK with me - I think CamelCase came in a
> file copied from somewhere else and I don't like the inconsistency.
> 

I went ahead and cleaned it up, and submitted.

Oddly enough I ran afoul of some timing issue in the PQM, whereby it
rejected me for something unrelated (test_diff_rev_tree_rev_tree), and
then a simple re-submit was accepted. (I did a test merge locally, and
reran the test to make sure it passed locally, but I didn't commit that
before I re-submitted).

I don't know if this is the hashcache stuff or not, but it seems like it
could be.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEsS7kJdeBCYSNAAMRAj+4AJ4mxfOfhjoKrlqX0nX/IdJfl+eEEQCeNZ0V
AKZbdVUeBzDqAtDk22o9OOA=
=mMgn
-----END PGP SIGNATURE-----