/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Aaron Bentley
  • Date: 2007-09-13 01:54:49 UTC
  • mfrom: (2817 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2826.
  • Revision ID: aaron.bentley@utoronto.ca-20070913015449-bjjw2njf3in5roq7
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
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, False, True)
175
175
            else:
176
176
                new_inventory_vf.add_lines(rev_id, parents, self.inventory.get_lines(rev_id))
177
177