← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

[merge] bzr.dev 1491

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
272
272
 
273
273
            self._record_inventory()
274
274
            self._make_revision()
 
275
            self.work_tree.set_pending_merges([])
275
276
            self.branch.append_revision(self.rev_id)
276
 
            self.work_tree.set_pending_merges([])
277
277
            self.reporter.completed(self.branch.revno()+1, self.rev_id)
278
278
            if self.config.post_commit() is not None:
279
279
                hooks = self.config.post_commit().split(' ')
391
391
        for path, ie in self.new_inv.iter_entries():
392
392
            previous_entries = ie.find_previous_heads(
393
393
                self.parent_invs, 
394
 
                self.weave_store.get_weave_or_empty(ie.file_id,
 
394
                self.weave_store.get_weave_prelude_or_empty(ie.file_id,
395
395
                    self.branch.get_transaction()))
396
396
            if ie.revision is None:
397
397
                change = ie.snapshot(self.rev_id, path, previous_entries,