← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

  • Committer: Robert Collins
  • Date: 2005-10-06 02:51:02 UTC
  • Revision ID: robertc@robertcollins.net-20051006025102-91f3a5a8d9283752
use weave ancestry to determine inventory entry previous heads, prevent propogating 'I did a merge' merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
340
340
            w = Weave(file_id)
341
341
            self.text_weaves[file_id] = w
342
342
        text_changed = False
343
 
        previous_entries = ie.find_previous_heads(parent_invs)
 
343
        previous_entries = ie.find_previous_heads(parent_invs, w)
344
344
        for old_revision in previous_entries:
345
345
                # if this fails, its a ghost ?
346
346
                assert old_revision in self.converted_revs