/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/urlutils.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-22 20:26:46 UTC
  • mfrom: (3567.2.1 rebase-..-paths)
  • Revision ID: pqm@pqm.ubuntu.com-20080722202646-5kwh910svyyumzre
(Michael Hudson) urutils.rebase_url handles '..' path segments in the
        url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
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):