← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-24 01:56:17 UTC
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120124015617-b56805ockeulemhf
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_repository.py
2905
2905
                kind = entry.kind
2906
2906
                texts_possibly_new_in_tree.add((file_id, entry.revision))
2907
2907
            for basis_id, basis_tree in possible_trees:
2908
 
                basis_inv = basis_tree.inventory
 
2908
                basis_inv = basis_tree.root_inventory
2909
2909
                for file_key in list(texts_possibly_new_in_tree):
2910
2910
                    file_id, file_revision = file_key
2911
2911
                    try: