← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-12-16 23:20:51 UTC
  • mfrom: (5573.1.1 merge_2.2_to_dev)
  • Revision ID: pqm@pqm.ubuntu.com-20101216232051-kv49ainzwdyjg92m
(gz) Merge 2.2 to bzr.dev to pick up fixes for lp:686611 and lp:687653
 (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
418
418
 
419
419
        # expand any symlinks in the directory part, while leaving the
420
420
        # filename alone
421
 
        file_list = map(osutils.normalizepath, file_list)
 
421
        # only expanding if symlinks are supported avoids windows path bugs
 
422
        if osutils.has_symlinks():
 
423
            file_list = map(osutils.normalizepath, file_list)
422
424
 
423
425
        # validate user file paths and convert all paths to tree
424
426
        # relative : it's cheaper to make a tree relative path an abspath