← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Aaron Bentley
  • Date: 2008-06-20 14:47:40 UTC
  • mto: This revision was merged to the branch mainline in revision 3538.
  • Revision ID: aaron@aaronbentley.com-20080620144740-v5wgzwe4zoua3065
Updates from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
658
658
    new_parsed = urlparse.urlparse(new_base)
659
659
    if (old_parsed[:2]) != (new_parsed[:2]):
660
660
        raise errors.InvalidRebaseURLs(old_base, new_base)
661
 
    return determine_relative_path(new_parsed.path,
 
661
    return determine_relative_path(new_parsed[2],
662
662
                                   osutils.pathjoin(old_parsed.path, url))
663
663
 
664
664