diff -r a101a743c570 -r c1d375e93ee8 mercurial/context.py --- a/mercurial/context.py Thu Apr 15 21:59:21 2010 +0200 +++ b/mercurial/context.py Fri Apr 16 01:57:32 2010 +0200 @@ -687,7 +687,7 @@ node, flag = self._repo.manifest.find(mnode, orig) ff = self._repo.dirstate.flagfunc(lambda x: flag or None) try: - return ff(orig) + return ff(path) except OSError: pass