~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Aaron Bentley
  • Date: 2007-06-21 02:33:43 UTC
  • mfrom: (2530.1.1 get_ancestry_no_topo)
  • mto: This revision was merged to the branch mainline in revision 2542.
  • Revision ID: aaron.bentley@utoronto.ca-20070621023343-3f3oy8iszatpjcui
Merge of not-sorting-ancestry branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
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]