[Pkg-bazaar-commits] ./bzr/unstable r140: fix error message for repeated add

[mbp at sourcefrog.net]

------------------------------------------------------------
revno: 140
committer: mbp at sourcefrog.net
timestamp: Tue 2005-03-29 17:15:34 +1000
message:
  fix error message for repeated add
modified:
  bzrlib/inventory.py
-------------- next part --------------
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2005-03-29 07:13:49 +0000
+++ b/bzrlib/inventory.py	2005-03-29 07:15:34 +0000
@@ -343,7 +343,8 @@
             bailout("attempt to add under non-directory {%s}" % parent.file_id)
 
         if parent.children.has_key(entry.name):
-            bailout("{%s} already has child %r" % (parent.file_id, entry.name))
+            bailout("%s is already versioned" %
+                    appendpath(self.id2path(parent.file_id), entry.name))
 
         self._byid[entry.file_id] = entry
         parent.children[entry.name] = entry