/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: Robert Collins
  • Date: 2008-02-13 03:30:01 UTC
  • mfrom: (3221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3224.
  • Revision ID: robertc@robertcollins.net-20080213033001-rw70ul0zb02ph856
Merge to fix conflicts.

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:]