← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Aaron Bentley
  • Date: 2005-08-10 16:02:38 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: abentley@panoramicfeedback.com-20050810160238-de95cd021dae7a02
Stopped using SourceFile in inventory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
77
77
def invert_invent(inventory):
78
78
    invert_invent = {}
79
79
    for key, value in inventory.iteritems():
80
 
        invert_invent[value.id] = key
 
80
        invert_invent[value.file_id] = key
81
81
    return invert_invent
82
82
 
83
83
def make_inv(inventory):