← 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-05 23:01:07 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105230107-63b2bb28dd1f6199
Move pending_merges() to WorkingTree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
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 = []