← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: abentley
  • Date: 2005-10-14 04:32:24 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051014043224-347635f0e1fbc673
Propogated has_or_had_id to Tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
107
107
    cset = changeset_function(base, other, interesting_ids)
108
108
    new_cset = make_merge_changeset(cset, this, base, other, 
109
109
                                    conflict_handler, merge_factory)
110
 
    result = apply_changeset(new_cset, invert_invent(this.inventory),
 
110
    result = apply_changeset(new_cset, invert_invent(this.tree.inventory),
111
111
                             this.basedir, conflict_handler, False)
112
112
    conflict_handler.finalize()
113
113
    return result
127
127
            new_contents = make_merged_contents(entry, this, base, other, 
128
128
                                                conflict_handler,
129
129
                                                merge_factory)
130
 
            print new_contents.is_creation()
131
130
            new_entry.contents_change = new_contents
132
131
            new_entry.metadata_change = make_merged_metadata(entry, base, other)
133
132
            new_cset.add_entry(new_entry)
159
158
    from bzrlib.trace import mutter
160
159
    def entry_data(file_id, tree):
161
160
        assert hasattr(tree, "__contains__"), "%s" % tree
162
 
        if not tree.has_id(file_id, allow_root=True):
 
161
        if not tree.has_or_had_id(file_id):
163
162
            return (None, None, "")
164
 
        entry = tree.inventory[file_id]
 
163
        entry = tree.tree.inventory[file_id]
165
164
        my_dir = tree.id2path(entry.parent_id)
166
165
        if my_dir is None:
167
166
            my_dir = ""