Mercurial > hg
diff mercurial/context.py @ 11144:ca46910dd9ea
merge with stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 11 May 2010 20:21:25 +0200 |
parents | 22f5ad0b5857 e0a0af140f2e |
children | c5c190822501 |
line wrap: on
line diff
--- a/mercurial/context.py Mon May 10 22:52:28 2010 +0200 +++ b/mercurial/context.py Tue May 11 20:21:25 2010 +0200 @@ -724,7 +724,7 @@ def findflag(ctx): mnode = ctx.changeset()[0] node, flag = self._repo.manifest.find(mnode, orig) - ff = self._repo.dirstate.flagfunc(lambda x: flag or None) + ff = self._repo.dirstate.flagfunc(lambda x: flag or '') try: return ff(path) except OSError: