← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Martin
  • Date: 2010-12-16 20:41:47 UTC
  • mfrom: (5050.58.4 2.2)
  • mto: This revision was merged to the branch mainline in revision 5574.
  • Revision ID: gzlist@googlemail.com-20101216204147-aquetqr5v8pilrzx
Merge 2.2 for fixes to lp:686611 and lp:687653

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