← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-16 10:03:17 UTC
  • mfrom: (3224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080216100317-xg1hdw306evlgt94
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)

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)