← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1372
1372
 
1373
1373
 
1374
1374
class DirStateWorkingTreeFormat(WorkingTreeFormat3):
 
1375
 
1375
1376
    def initialize(self, a_bzrdir, revision_id=None, from_branch=None,
1376
1377
                   accelerator_tree=None, hardlink=False):
1377
1378
        """See WorkingTreeFormat.initialize().
1832
1833
        entry = self._get_entry(file_id=file_id)[1]
1833
1834
        if entry is None:
1834
1835
            raise errors.NoSuchId(tree=self, file_id=file_id)
1835
 
        return dirstate.DirState._minikind_to_kind[entry[1][0]]
 
1836
        parent_index = self._get_parent_index()
 
1837
        return dirstate.DirState._minikind_to_kind[entry[parent_index][0]]
1836
1838
 
1837
1839
    def stored_kind(self, file_id):
1838
1840
        """See Tree.stored_kind"""