Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 7930:072df47d84c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Martin Geisler <mg@daimi.au.dk>
date Tue, 31 Mar 2009 23:11:11 +0200
parents 553aa0cbeab6 47b0a881638f
children de377b1a9a84
comparison
equal deleted inserted replaced
7928:0796c8862bee 7930:072df47d84c1
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: