← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2006-09-05 09:49:40 UTC
  • mto: (1852.16.2 Tree.walkdirs)
  • mto: This revision was merged to the branch mainline in revision 1993.
  • Revision ID: robertc@robertcollins.net-20060905094940-d7ff941c7dfc56a9
Deprecated WorkingTree.pending_merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
724
724
        if updated:
725
725
            self.set_parent_ids(parents, allow_leftmost_as_ghost=True)
726
726
 
 
727
    @deprecated_method(zero_eleven)
727
728
    @needs_read_lock
728
729
    def pending_merges(self):
729
730
        """Return a list of pending merges.