← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-04 22:23:20 UTC
  • mfrom: (5825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5830.
  • Revision ID: jelmer@samba.org-20110504222320-bczsppms2wadcrb4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
2474
2474
            # the suffix is from tree_index+1:parent_count+1.
2475
2475
            new_location_suffix = [DirState.NULL_PARENT_DETAILS] * (parent_count - tree_index)
2476
2476
            # now stitch in all the entries from this tree
2477
 
            for path, entry in tree.inventory.iter_entries_by_dir():
 
2477
            for path, entry in tree.iter_entries_by_dir():
2478
2478
                # here we process each trees details for each item in the tree.
2479
2479
                # we first update any existing entries for the id at other paths,
2480
2480
                # then we either create or update the entry for the id at the