← 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 03:50:50 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051014035050-d779472ccb599a51
semi-broke merge

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.tree.inventory),
111
 
                             this.root, conflict_handler, False)
 
110
    result = apply_changeset(new_cset, invert_invent(this.inventory),
 
111
                             this.basedir, conflict_handler, False)
112
112
    conflict_handler.finalize()
113
113
    return result
114
114
 
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()
130
131
            new_entry.contents_change = new_contents
131
132
            new_entry.metadata_change = make_merged_metadata(entry, base, other)
132
133
            new_cset.add_entry(new_entry)
158
159
    from bzrlib.trace import mutter
159
160
    def entry_data(file_id, tree):
160
161
        assert hasattr(tree, "__contains__"), "%s" % tree
161
 
        if not tree.has_or_had_id(file_id):
 
162
        if not tree.has_id(file_id, allow_root=True):
162
163
            return (None, None, "")
163
 
        entry = tree.tree.inventory[file_id]
 
164
        entry = tree.inventory[file_id]
164
165
        my_dir = tree.id2path(entry.parent_id)
165
166
        if my_dir is None:
166
167
            my_dir = ""