author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Tue, 11 May 2010 20:13:52 +0200 | |
branch | stable |
changeset 11143 | e0a0af140f2e |
parent 11128 | a9b427b5821e |
child 11144 | ca46910dd9ea |
child 11154 | 17031fea4e95 |
--- a/mercurial/context.py Sun May 09 19:11:02 2010 +0200 +++ b/mercurial/context.py Tue May 11 20:13:52 2010 +0200 @@ -685,7 +685,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: