Submitter | Katsunori FUJIWARA |
---|---|
Date | Aug. 15, 2014, 11:32 a.m. |
Message ID | <c257a3b4fe4190c1b6cd.1408102332@feefifofum> |
Download | mbox | patch |
Permalink | /patch/5408/ |
State | Accepted |
Headers | show |
Comments
Patch
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -717,6 +717,13 @@ return result def hgmerge(orig, repo, node, force=None, remind=True): + wlock = repo.wlock() + try: + return _hgmerge(orig, repo, node, force, remind) + finally: + wlock.release() + +def _hgmerge(orig, repo, node, force, remind): result = orig(repo, node, force, remind) lfcommands.updatelfiles(repo.ui, repo) return result