# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 2010-05-11 18:21:25
# Node ID ca46910dd9eaff32e7b13ebb9b226f3876a56fe3
# Parent  0bf79efeaa20650d1f3c74ea3e7dd7e209860476
# Parent  e0a0af140f2e1054026c6c12a7130c39d0cfabdb

merge with stable

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -724,7 +724,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: