← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-09-30 06:39:42 UTC
  • mfrom: (1185.10.11)
  • mto: (1185.14.2)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: mbp@sourcefrog.net-20050930063942-3eab86500bffba49
- merge merge and export fixes from aaron
aaron.bentley@utoronto.ca-20050930040234-71c1a151f795e806

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
342
342
                deleted_ids.append(ie.file_id)
343
343
        if deleted_ids:
344
344
            for file_id in deleted_ids:
345
 
                del self.work_inv[file_id]
 
345
                if file_id in self.work_inv:
 
346
                    del self.work_inv[file_id]
346
347
            self.branch._write_inventory(self.work_inv)
347
348
 
348
349