/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

Merge 2.0 into 2.1 resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1282
1282
    def add(self, entry):
1283
1283
        """Add entry to inventory.
1284
1284
 
1285
 
        To add  a file to a branch ready to be committed, use Branch.add,
1286
 
        which calls this.
1287
 
 
1288
1285
        :return: entry
1289
1286
        """
1290
1287
        if entry.file_id in self._byid: