diff -r 366fa83f9820 -r 23f2736abce3 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Thu Apr 21 12:10:03 2011 +0200
+++ b/mercurial/dirstate.py	Thu Apr 21 13:18:52 2011 +0200
@@ -7,7 +7,7 @@
 
 from node import nullid
 from i18n import _
-import util, ignore, osutil, parsers, encoding
+import scmutil, util, ignore, osutil, parsers, encoding
 import struct, os, stat, errno
 import cStringIO
 
@@ -269,7 +269,7 @@
     def _addpath(self, f, check=False):
         oldstate = self[f]
         if check or oldstate == "r":
-            util.checkfilename(f)
+            scmutil.checkfilename(f)
             if f in self._dirs:
                 raise util.Abort(_('directory %r already in dirstate') % f)
             # shadows