/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/delta.py

  • Committer: John Arbash Meinel
  • Date: 2006-10-16 01:50:48 UTC
  • mfrom: (2078 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: john@arbash-meinel.com-20061016015048-0f22df07e38093da
[merge] bzr.dev 2078

Show diffs side-by-side

added added

removed removed

Lines of Context:
152
152
        want_unchanged=want_unchanged,
153
153
        specific_files=specific_files,
154
154
        extra_trees=extra_trees,
155
 
        require_versioned=require_versioned)
 
155
        require_versioned=require_versioned,
 
156
        include_root=False)
156
157
 
157
158
 
158
159
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
159
160
                   include_root):
160
161
 
161
162
    from osutils import is_inside_any
162
 
    
163
163
    old_inv = old_tree.inventory
164
164
    new_inv = new_tree.inventory
165
165
    delta = TreeDelta()