← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-09 15:33:25 UTC
  • mto: (5082.2.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5084.
  • Revision ID: v.ladeuil+lp@free.fr-20100309153325-w16djg6tbkt0905a
Deprecate Merge3Merger.scalar_three_way.

* bzrlib/merge.py:
(Merge3Merger.scalar_three_way): Deprecated, not used in the
current code base, skimming history seem to reveal it hasn't been
used for quite a long time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
110
110
        """Get the relative path for repository from current_transport."""
111
111
        # the relpath of the bzrdir in the found repository gives us the
112
112
        # path segments to pop-out.
113
 
        relpath = repository.user_transport.relpath(
 
113
        relpath = repository.bzrdir.root_transport.relpath(
114
114
            current_transport.base)
115
115
        if len(relpath):
116
116
            segments = ['..'] * len(relpath.split('/'))