← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-02 19:52:23 UTC
  • mfrom: (3139.2.2 fix.90847)
  • Revision ID: pqm@pqm.ubuntu.com-20080102195223-2kpjtcoeqvvcrcki
(bialix) fix #90847: fix problem with parent location on another
 logical drive

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
370
370
    other_scheme = other[:other_first_slash]
371
371
    if base_scheme != other_scheme:
372
372
        return other
 
373
    elif sys.platform == 'win32' and base_scheme == 'file://':
 
374
        base_drive = base[base_first_slash+1:base_first_slash+3]
 
375
        other_drive = other[other_first_slash+1:other_first_slash+3]
 
376
        if base_drive != other_drive:
 
377
            return other
373
378
 
374
379
    base_path = base[base_first_slash+1:]
375
380
    other_path = other[other_first_slash+1:]