# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 2010-05-11 18:13:52
# Node ID e0a0af140f2e1054026c6c12a7130c39d0cfabdb
# Parent  a9b427b5821e7006c7033ddc4075455c572d6d3a

context: fallback function should not return None

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -685,7 +685,7 @@ class workingctx(changectx):
         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: