← 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: 2010-08-17 08:47:32 UTC
  • mfrom: (5377.2.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100817084732-nqa09at3c7h0wb7u
(spiv) Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859,
        #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1178
1178
    def add(self, entry):
1179
1179
        """Add entry to inventory.
1180
1180
 
1181
 
        To add  a file to a branch ready to be committed, use Branch.add,
1182
 
        which calls this.
1183
 
 
1184
1181
        :return: entry
1185
1182
        """
1186
1183
        if entry.file_id in self._byid: