mercurial/dirstate.py

--- a/mercurial/dirstate.py	Wed Jul 04 01:31:37 2012 +0200
+++ b/mercurial/dirstate.py	Mon Jul 16 16:19:53 2012 -0500
@@ -313,7 +313,6 @@
             _decdirs(self._dirs, f)
 
     def _addpath(self, f, state, mode, size, mtime):
-        assert state not in "?r"
         oldstate = self[f]
         if state == 'a' or oldstate == 'r':
             scmutil.checkfilename(f)