← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-08-07 07:17:34 UTC
  • mfrom: (2675.1.2 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070807071734-qrnzeyjktp2f7022
(Marius Kruger) InterTree.compare doesn't pass require_versioned on correctly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
217
217
 
218
218
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
219
219
                   include_root, extra_trees=None,
220
 
                   want_unversioned=False):
 
220
                   require_versioned=False, want_unversioned=False):
221
221
    """Worker function that implements Tree.changes_from."""
222
222
    delta = TreeDelta()
223
223
    # mutter('start compare_trees')
225
225
    for (file_id, path, content_change, versioned, parent_id, name, kind,
226
226
         executable) in new_tree._iter_changes(old_tree, want_unchanged,
227
227
            specific_files, extra_trees=extra_trees,
 
228
            require_versioned=require_versioned,
228
229
            want_unversioned=want_unversioned):
229
230
        if versioned == (False, False):
230
231
            delta.unversioned.append((path[1], None, kind[1]))