diff -r 414374cfb531 -r a4679a74df14 mercurial/manifest.py
--- a/mercurial/manifest.py	Wed Dec 17 15:11:26 2014 -0800
+++ b/mercurial/manifest.py	Thu Dec 18 16:41:59 2014 -0600
@@ -17,6 +17,9 @@
             flags = {}
         dict.__init__(self, mapping)
         self._flags = flags
+    def __setitem__(self, k, v):
+        assert v is not None
+        dict.__setitem__(self, k, v)
     def flags(self, f):
         return self._flags.get(f, "")
     def withflags(self):