← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-04 14:05:24 UTC
  • mfrom: (1551.13.14 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070404140524-48cdc6512763399e
Fix encoding bug generating error on already-versioned files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1154
1154
            if entry.name in parent.children:
1155
1155
                raise BzrError("%s is already versioned" %
1156
1156
                        osutils.pathjoin(self.id2path(parent.file_id),
1157
 
                        entry.name))
 
1157
                        entry.name).encode('utf-8'))
1158
1158
            parent.children[entry.name] = entry
1159
1159
        return self._add_child(entry)
1160
1160