← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Robert Collins
  • Date: 2006-02-26 07:54:02 UTC
  • mto: (1587.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1588.
  • Revision ID: robertc@robertcollins.net-20060226075402-92fca9fdb7b0070d
Check for incorrect revision parentage in the weave during revision access.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
133
133
        # pick a random revision
134
134
        # analyse revision id rev_id and put it in the stack.
135
135
        self._reweave_step('loading revisions')
136
 
        rev = self.repo.get_revision(rev_id)
 
136
        rev = self.repo.get_revision_reconcile(rev_id)
137
137
        assert rev.revision_id == rev_id
138
138
        parents = []
139
139
        for parent in rev.parent_ids: