# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1185995030 25200
# Node ID ed68c8c31c9a8cb454c8382ab7913d26fbf29b1b
# Parent  8b1ee1f59b3c9c7cea7eaf66121ce8217cd677d9# Parent  58006f8b8275e89ab58894139bb75cf175a522d4
Automated merge with http://hg.intevation.org/mercurial/crew

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -191,13 +191,14 @@ class dirstate(object):
             raise util.Abort(_("'\\n' and '\\r' disallowed in filenames"))
         # shadows
         if f in self._dirs:
-            raise util.Abort(_('directory named %r already in dirstate') % f)
+            raise util.Abort(_('directory %r already in dirstate') % f)
         for c in strutil.rfindall(f, '/'):
             d = f[:c]
             if d in self._dirs:
                 break
             if d in self._map:
-                raise util.Abort(_('file named %r already in dirstate') % d)
+                raise util.Abort(_('file %r in dirstate clashes with %r') %
+                                 (d, f))
         self._incpath(f)
 
     def normal(self, f):