changeset 32387 | 655f1e2cfa5a |
parent 32372 | df448de7cf3b |
parent 32326 | 99515353c72a |
child 32411 | 08d02c1d7e67 |
32386:7640584e697c | 32387:655f1e2cfa5a |
---|---|
787 lock = repo.lock() |
787 lock = repo.lock() |
788 try: |
788 try: |
789 tr = repo.transaction('pushkey: obsolete markers') |
789 tr = repo.transaction('pushkey: obsolete markers') |
790 try: |
790 try: |
791 repo.obsstore.mergemarkers(tr, data) |
791 repo.obsstore.mergemarkers(tr, data) |
792 repo.invalidatevolatilesets() |
|
792 tr.close() |
793 tr.close() |
793 return 1 |
794 return 1 |
794 finally: |
795 finally: |
795 tr.release() |
796 tr.release() |
796 finally: |
797 finally: |