← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Andrew Bennetts
  • Date: 2010-08-17 06:45:33 UTC
  • mfrom: (5050.17.9 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: andrew.bennetts@canonical.com-20100817064533-kof2i2f3r6mr4ayb
Merge lp:bzr/2.2 into lp:bzr, including fixes for #192859, #224373, #300062, #585667, #614404, #617503.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1266
1266
                # absolute path
1267
1267
                fap = from_dir_abspath + '/' + f
1268
1268
 
1269
 
                f_ie = inv.get_child(from_dir_id, f)
 
1269
                dir_ie = inv[from_dir_id]
 
1270
                if dir_ie.kind == 'directory':
 
1271
                    f_ie = dir_ie.children.get(f)
 
1272
                else:
 
1273
                    f_ie = None
1270
1274
                if f_ie:
1271
1275
                    c = 'V'
1272
1276
                elif self.is_ignored(fp[1:]):
1273
1277
                    c = 'I'
1274
1278
                else:
1275
 
                    # we may not have found this file, because of a unicode issue
 
1279
                    # we may not have found this file, because of a unicode
 
1280
                    # issue, or because the directory was actually a symlink.
1276
1281
                    f_norm, can_access = osutils.normalized_filename(f)
1277
1282
                    if f == f_norm or not can_access:
1278
1283
                        # No change, so treat this file normally