diff options
Diffstat (limited to 'tools/mergetools.py')
| -rw-r--r-- | tools/mergetools.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/mergetools.py b/tools/mergetools.py index 9a4f6b2..ecad7ca 100644 --- a/tools/mergetools.py +++ b/tools/mergetools.py @@ -490,8 +490,10 @@ class FileDB: self.lockfile = flock_sh_wait(self.path + "/.lock") def lock_ex(self): self.lockfile = flock_ex_wait(self.path + "/.lock") - def commit(self): + def release_lock(self): flock_release(self.lockfile) + def commit(self): + pass class PermDB: def __init__(self, path): @@ -504,6 +506,8 @@ class PermDB: assert False # NYI def lock_ex(self): assert False # NYI + def release_lock(self): + assert False # NYI def commit(self): permdb.committree(self.permdbobj) |