/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-20 13:19:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5952.
  • Revision ID: jelmer@samba.org-20110520131928-h6bm9r5lxb13c46r
Look at parent_ie.children.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
472
472
                conflicts_related.update(c.associated_filenames())
473
473
        else:
474
474
            conflicts_related = None
475
 
        adder = _SmartAddHelper(self, action,
476
 
            conflicts_related)
 
475
        adder = _SmartAddHelper(self, action, conflicts_related)
477
476
        adder.add(file_list, recurse=recurse)
478
477
        if save:
479
478
            invdelta = adder.get_inventory_delta()
783
782
                        trace.mutter("skip control directory %r", subp)
784
783
                        continue
785
784
                    sub_invp = osutils.pathjoin(inv_path, inv_f)
786
 
                    sub_ie = self._get_ie(sub_invp)
 
785
                    entry = self._invdelta.get(sub_invp)
 
786
                    if entry is not None:
 
787
                        sub_ie = entry[3]
 
788
                    else:
 
789
                        sub_ie = this_ie.children.get(inv_f)
787
790
                    if sub_ie is not None:
788
791
                        # recurse into this already versioned subdir.
789
792
                        things_to_add.append((subp, sub_invp, sub_ie, this_ie))