Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 11 May 2010 20:21:25 +0200
changeset 11144 ca46910dd9ea
parent 11142 0bf79efeaa20 (current diff)
parent 11143 e0a0af140f2e (diff)
child 11145 06586648eeec
merge with stable
mercurial/context.py file | annotate | diff | comparison | revisions 
--- 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:
hg-stable