Comments
Patch
@@ -1112,7 +1113,7 @@
self._filecache['dirstate'].refresh()
l = self._lock(self.vfs, "wlock", wait, unlock,
- self.invalidatedirstate, _('working directory of %s') %
+ self.invalidate, _('working directory of %s') %
self.origroot)
self._wlockref = weakref.ref(l)
return l
2) take the real lock at the same time as the wlock
@@ -475,6 +475,7 @@
# the backout should appear on the same branch
wlock = repo.wlock()
+ lock = repo.lock()
try:
branch = repo.dirstate.branch()
bheads = repo.branchheads(branch)
@@ -535,6 +536,7 @@
finally:
ui.setconfig('ui', 'forcemerge', '', '')
finally:
+ lock.release()
wlock.release()
return 0