Rev 2417: Avoid directly accessing tree.inventory in merge.py in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2417
revision-id: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
parent: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Mon 2007-02-26 10:59:24 -0600
message:
  Avoid directly accessing tree.inventory in merge.py
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
-------------- next part --------------
=== modified file 'bzrlib/merge.py'
--- a/bzrlib/merge.py	2007-02-17 03:34:50 +0000
+++ b/bzrlib/merge.py	2007-02-26 16:59:24 +0000
@@ -171,7 +171,7 @@
         for path in file_list:
             found_id = False
             for tree in (self.this_tree, self.base_tree, self.other_tree):
-                file_id = tree.inventory.path2id(path)
+                file_id = tree.path2id(path)
                 if file_id is not None:
                     interesting_ids.add(file_id)
                     found_id = True