← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2005-11-06 00:12:04 UTC
  • mfrom: (1457.1.16)
  • Revision ID: robertc@robertcollins.net-20051106001204-b8c6d5169308d7e6
All pending merges operations from Branch are now on WorkingTree.
(Robert Collins)

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(' ')
310
310
 
311
311
    def _gather_parents(self):
312
312
        """Record the parents of a merge for merge detection."""
313
 
        pending_merges = self.branch.pending_merges()
 
313
        pending_merges = self.work_tree.pending_merges()
314
314
        self.parents = []
315
315
        self.parent_invs = []
316
316
        self.present_parents = []
376
376
            deleted_ids.sort(reverse=True)
377
377
            for path, file_id in deleted_ids:
378
378
                del self.work_inv[file_id]
379
 
            self.branch._write_inventory(self.work_inv)
 
379
            self.work_tree._write_inventory(self.work_inv)
380
380
 
381
381
    def _store_snapshot(self):
382
382
        """Pass over inventory and record a snapshot.