← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2007-06-28 02:43:50 UTC
  • mfrom: (2553 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2558.
  • Revision ID: robertc@robertcollins.net-20070628024350-z8bdm0y6yz2uyf4o
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
607
607
        else:
608
608
            return self.get_ancestry(version_ids)
609
609
 
610
 
    def get_ancestry(self, version_ids):
 
610
    def get_ancestry(self, version_ids, topo_sorted=True):
611
611
        """See VersionedFile.get_ancestry."""
612
612
        if isinstance(version_ids, basestring):
613
613
            version_ids = [version_ids]