~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

urlutils.rebase_url handles '..' path segments in 'url'

Show diffs side-by-side

added added

removed removed

Lines of Context:
667
667
    if (old_parsed[:2]) != (new_parsed[:2]):
668
668
        raise errors.InvalidRebaseURLs(old_base, new_base)
669
669
    return determine_relative_path(new_parsed[2],
670
 
                                   osutils.pathjoin(old_parsed[2], url))
 
670
                                   join(old_parsed[2], url))
671
671
 
672
672
 
673
673
def determine_relative_path(from_path, to_path):