/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Andrew Bennetts
  • Date: 2008-02-07 03:47:24 UTC
  • mfrom: (3218 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3220.
  • Revision ID: andrew.bennetts@canonical.com-20080207034724-p3zhr7zp9kow4nax
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1778
1778
        """Return the graph walker for this repository format"""
1779
1779
        parents_provider = self._make_parents_provider()
1780
1780
        if (other_repository is not None and
1781
 
            other_repository.bzrdir.transport.base !=
1782
 
            self.bzrdir.transport.base):
 
1781
            not self.has_same_location(other_repository)):
1783
1782
            parents_provider = graph._StackedParentsProvider(
1784
1783
                [parents_provider, other_repository._make_parents_provider()])
1785
1784
        return graph.Graph(parents_provider)