~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Aaron Bentley
  • Date: 2005-10-13 21:58:18 UTC
  • mfrom: (1447)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@troll-20051013215818-0900f030e3923901
Fixed symlink reverting

Show diffs side-by-side

added added

removed removed

Lines of Context:
187
187
            # get them
188
188
            old_path = old_inv.id2path(file_id)
189
189
            new_path = new_inv.id2path(file_id)
190
 
            old_ie._read_tree_state(old_tree)
191
 
            new_ie._read_tree_state(new_tree)
 
190
            old_ie._read_tree_state(old_path, old_tree)
 
191
            new_ie._read_tree_state(new_path, new_tree)
192
192
            text_modified, meta_modified = new_ie.detect_changes(old_ie)
193
193
 
194
194
            # TODO: Can possibly avoid calculating path strings if the