/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/commit.py

  • Committer: Robert Collins
  • Date: 2005-11-05 23:25:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105232539-7ecddc1d5c8f66fe
Move set_pending_merges to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
267
267
            self._record_inventory()
268
268
            self._make_revision()
269
269
            self.branch.append_revision(self.rev_id)
270
 
            self.branch.set_pending_merges([])
 
270
            self.work_tree.set_pending_merges([])
271
271
            self.reporter.completed(self.branch.revno()+1, self.rev_id)
272
272
            if self.config.post_commit() is not None:
273
273
                hooks = self.config.post_commit().split(' ')