comparison mercurial/localrepo.py @ 7929:47b0a881638f

error: import LockError from correct module
author Simon Heimberg <simohe@besonet.ch>
date Tue, 31 Mar 2009 07:56:28 +0200
parents 89e05c02a4af
children 072df47d84c1
comparison
equal deleted inserted replaced
7921:f62482848d1b 7929:47b0a881638f
1061 try: 1061 try:
1062 try: 1062 try:
1063 wlock = self.wlock(False) 1063 wlock = self.wlock(False)
1064 for f in fixup: 1064 for f in fixup:
1065 self.dirstate.normal(f) 1065 self.dirstate.normal(f)
1066 except lock.LockError: 1066 except error.LockError:
1067 pass 1067 pass
1068 finally: 1068 finally:
1069 del wlock 1069 del wlock
1070 1070
1071 if not parentworking: 1071 if not parentworking: