Mercurial > public > mercurial-scm > hg-stable

diff tests/test-lock.py @ 26499:e72b62b154b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: prevent wlock from being inherited when a transaction is running Review feedback from Pierre-Yves David. A separate line of work is working to ensure that dirstate writes are written to a separate 'pending' file while a transaction is active. Lock inheritance currently conflicts with that, so dodge the issue by simply preventing inheritance while a transaction is running. Custom merge drivers aren't going to run inside a transaction, so this doesn't affect that.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 06 Oct 2015 13:19:05 -0700
parents e8564e04382d
children 14033c5dd261
line wrap: on
line diff
--- a/tests/test-lock.py	Tue Oct 06 13:13:31 2015 -0700
+++ b/tests/test-lock.py	Tue Oct 06 13:19:05 2015 -0700
@@ -260,7 +260,7 @@
         state.assertacquirecalled(True)
 
         def tryinherit():
-            with lock.inherit() as lockname:
+            with lock.inherit():
                 pass
 
         self.assertRaises(error.LockInheritanceContractViolation, tryinherit)