← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/knit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-09 18:17:10 UTC
  • mfrom: (5655.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110209181710-h55d74ahkew1tkhl
(vila) Merge 2.3 into trunk including fix for bug #715000 (Vincent
        Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/knit.py
1196
1196
    def get_known_graph_ancestry(self, keys):
1197
1197
        """Get a KnownGraph instance with the ancestry of keys."""
1198
1198
        parent_map, missing_keys = self._index.find_ancestry(keys)
1199
 
        for fallback in self._fallback_vfs:
 
1199
        for fallback in self._transitive_fallbacks():
1200
1200
            if not missing_keys:
1201
1201
                break
1202
1202
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(