← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2007-02-01 14:04:15 UTC
  • mto: This revision was merged to the branch mainline in revision 2254.
  • Revision ID: abentley@panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
Clean up whitespace changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1230
1230
    return conflicts
1231
1231
 
1232
1232
 
1233
 
def _alter_files(working_tree, target_tree, tt, pb, interesting_ids, backups, 
 
1233
def _alter_files(working_tree, target_tree, tt, pb, interesting_ids, backups,
1234
1234
                 report_changes):
1235
1235
    from bzrlib import delta
1236
1236
    merge_modified = working_tree.merge_modified()
1237
 
    change_list = list(target_tree._iter_changes(working_tree, 
 
1237
    change_list = list(target_tree._iter_changes(working_tree,
1238
1238
        specific_file_ids=interesting_ids, pb=pb))
1239
1239
    if target_tree.inventory.root is None:
1240
1240
        skip_root = True