~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

Allow knits to be instructed not to add a text based on a sha, for commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
170
170
                # This is done to avoid a revision_count * time-to-write additional overhead on 
171
171
                # reconcile.
172
172
                new_inventory_vf._check_write_ok()
173
 
                Weave._add_lines(new_inventory_vf, rev_id, parents, self.inventory.get_lines(rev_id),
174
 
                                 None)
 
173
                Weave._add_lines(new_inventory_vf, rev_id, parents,
 
174
                    self.inventory.get_lines(rev_id), None, None, None)
175
175
            else:
176
176
                new_inventory_vf.add_lines(rev_id, parents, self.inventory.get_lines(rev_id))
177
177