← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-10-17 20:17:55 UTC
  • mfrom: (1185.16.59)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: abentley@panoramicfeedback.com-20051017201755-48ed4650792388ab
Merged latest from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
312
312
            interesting_ids = set()
313
313
            this_tree = this_branch.working_tree()
314
314
            for fname in file_list:
315
 
                path = this_branch.relpath(fname)
 
315
                path = this_tree.relpath(fname)
316
316
                found_id = False
317
317
                for tree in (this_tree, base_tree, other_tree):
318
318
                    file_id = tree.inventory.path2id(path)