~bzr-pqm/bzr/bzr.dev

Committer: Canonical.com Patch Queue Manager
Date: 2010-12-16 17:25:29 UTC
mfrom: (5050.61.1 merge_2.1_to_2.2)
mto: (5573.1.1 merge_2.2_to_dev) (5579.1.1 693880-ssl-readline) (5050.62.1 2.2) (5609.6.1 2.3.0-dev) (6024.3.1 integration) (6012.1.1 trunk) (4797.94.3 2.2-feature-flags)
mto: This revision was merged to the branch mainline in revision 5574.
Revision ID: pqm@pqm.ubuntu.com-20101216172529-yqw26u9ufho22nes

(vila) Merge 2.1 into 2.2 to pick up fix for lp:686611 (Martin [gz])

added added

removed removed

418

419

# expand any symlinks in the directory part, while leaving the

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