/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

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).encode('utf-8'))
 
1157
                        entry.name))
1158
1158
            parent.children[entry.name] = entry
1159
1159
        return self._add_child(entry)
1160
1160
 
1331
1331
            del self._byid[file_id]
1332
1332
        if ie.parent_id is not None:
1333
1333
            del self[ie.parent_id].children[ie.name]
1334
 
        else:
1335
 
            self.root = None
1336
1334
 
1337
1335
    def rename(self, file_id, new_parent_id, new_name):
1338
1336
        """Move a file within the inventory.