← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to upstream_import.py

  • Committer: Aaron Bentley
  • Date: 2013-08-20 03:02:43 UTC
  • Revision ID: aaron@aaronbentley.com-20130820030243-r8v1xfbcnd8f10p4
Fix zap command for 2.6/7

Show diffs side-by-side

added added

removed removed

Lines of Context:
upstream_import.py
196
196
def import_archive_to_transform(tree, archive_file, tt):
197
197
    prefix = common_directory(names_of_files(archive_file))
198
198
    removed = set()
199
 
    for path, entry in tree.inventory.iter_entries():
 
199
    for path, entry in tree.iter_entries_by_dir():
200
200
        if entry.parent_id is None:
201
201
            continue
202
202
        trans_id = tt.trans_id_tree_path(path)