← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-10-16 22:31:25 UTC
  • mto: This revision was merged to the branch mainline in revision 1458.
  • Revision ID: robertc@lifelesslap.robertcollins.net-20051016223125-26d4401cb94b7b82
Branch.relpath has been moved to WorkingTree.relpath.

WorkingTree no no longer takes an inventory, rather it takes an optional branch
parameter, and if None is given will open the branch at basedir implicitly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
390
390
            interesting_ids = set()
391
391
            this_tree = this_branch.working_tree()
392
392
            for fname in file_list:
393
 
                path = this_branch.relpath(fname)
 
393
                path = this_tree.relpath(fname)
394
394
                found_id = False
395
395
                for tree in (this_tree, base_tree.tree, other_tree.tree):
396
396
                    file_id = tree.inventory.path2id(path)