← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Aaron Bentley
  • Date: 2005-10-01 05:57:36 UTC
  • mfrom: (1393.1.23)
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051001055736-a1bb0acdce40852a
Merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
317
317
        rev_tmp = StringIO()
318
318
        serializer_v5.write_revision(self.rev, rev_tmp)
319
319
        rev_tmp.seek(0)
320
 
        self.branch.revision_store.add(rev_tmp, self.rev_id, compressed=True)
 
320
        self.branch.revision_store.add(rev_tmp, self.rev_id)
321
321
        mutter('new revision_id is {%s}', self.rev_id)
322
322
 
323
323
 
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