← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/groupcompress.py

  • Committer: Martin Pool
  • Date: 2011-02-09 06:46:13 UTC
  • mfrom: (5609.18.1 2.3)
  • mto: This revision was merged to the branch mainline in revision 5663.
  • Revision ID: mbp@sourcefrog.net-20110209064613-uej7cv8d2e7ymcbr
merge fix for bug 715000

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/groupcompress.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1312
1312
        # KnitVersionedFiles.get_known_graph_ancestry, but they don't share
1313
1313
        # ancestry.
1314
1314
        parent_map, missing_keys = self._index.find_ancestry(keys)
1315
 
        for fallback in self._fallback_vfs:
 
1315
        for fallback in self._transitive_fallbacks():
1316
1316
            if not missing_keys:
1317
1317
                break
1318
1318
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(