← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-30 11:14:06 UTC
  • mfrom: (6002 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110630111406-eimf301w6x92xkk7
merge in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
797
797
                                      require_versioned=True)
798
798
            # find_ids_across_trees may include some paths that don't
799
799
            # exist in 'tree'.
800
 
            entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
801
 
                             for file_id in file_ids if file_id in tree)
 
800
            entries = sorted(
 
801
                (tree.id2path(file_id), tree.inventory[file_id])
 
802
                for file_id in file_ids if tree.has_id(file_id))
802
803
        else:
803
804
            entries = tree.inventory.entries()
804
805
 
2155
2156
        basis_inv = basis.inventory
2156
2157
        inv = wt.inventory
2157
2158
        for file_id in inv:
2158
 
            if file_id in basis_inv:
 
2159
            if basis_inv.has_id(file_id):
2159
2160
                continue
2160
2161
            if inv.is_root(file_id) and len(basis_inv) == 0:
2161
2162
                continue