← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-23 09:00:18 UTC
  • mfrom: (5439.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100923090018-01aj4ifyzaps50bo
(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1738
1738
                elif kind == 'directory':
1739
1739
                    parent_ies[(dirname + '/' + name).strip('/')] = inv_entry
1740
1740
                elif kind == 'symlink':
1741
 
                    inv_entry.executable = False
1742
 
                    inv_entry.text_size = None
1743
1741
                    inv_entry.symlink_target = utf8_decode(fingerprint)[0]
1744
1742
                elif kind == 'tree-reference':
1745
1743
                    inv_entry.reference_revision = fingerprint or None