[MERGE REVIEW] Commit handles locking problems better

[Aaron Bentley]

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

James Blackwell wrote:
| On Fri, Mar 17, 2006 at 03:20:42PM -0500, Aaron Bentley wrote:
|
| (def _cleanup_bound_branch(self)
|
|>@@ -402,7 +404,8 @@
|>         """
|>         if not self.bound_branch:
|>             return
|>-        self.master_branch.unlock()
|>+        if self.master_locked:
|>+            self.master_branch.unlock()
|
|
| Does this need self.master_locked = False as well?

No, because this is cleanup code, so the check will only happen once.

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

iD8DBQFEHkSd0F+nu1YWqI0RAr6RAJ0Tbl1CbU1A9Zcr0tzc0ZerVL/OdgCeMD+w
ZA3lyQPUc3ymFFwIQBqL5Yk=
=JJqS
-----END PGP SIGNATURE-----