← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Aaron Bentley
  • Date: 2006-09-21 22:02:58 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: abentley@panoramicfeedback.com-20060921220258-50026dc4220c8b11
More work on bundles

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
54
54
    """
55
55
    
56
56
    def changes_from(self, other, want_unchanged=False, specific_files=None,
57
 
        extra_trees=None, require_versioned=False):
 
57
        extra_trees=None, require_versioned=False, include_root=False):
58
58
        """Return a TreeDelta of the changes from other to this tree.
59
59
 
60
60
        :param other: A tree to compare with.
81
81
            specific_files=specific_files,
82
82
            extra_trees=extra_trees,
83
83
            require_versioned=require_versioned,
 
84
            include_root=include_root
84
85
            )
85
86
    
86
87
    def conflicts(self):
398
399
 
399
400
    @needs_read_lock
400
401
    def compare(self, want_unchanged=False, specific_files=None,
401
 
        extra_trees=None, require_versioned=False):
 
402
        extra_trees=None, require_versioned=False, include_root=False):
402
403
        """Return the changes from source to target.
403
404
 
404
405
        :return: A TreeDelta.
426
427
            # _compare_trees would think we want a complete delta
427
428
            return delta.TreeDelta()
428
429
        return delta._compare_trees(self.source, self.target, want_unchanged,
429
 
            specific_file_ids)
 
430
            specific_file_ids, include_root)