← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-04 21:25:46 UTC
  • mfrom: (4409 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090604212546-dpmrzvg49q40tvnj
Merge bzr.dev 4409, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
137
137
    def _reconcile_revision_history(self):
138
138
        repo = self.branch.repository
139
139
        last_revno, last_revision_id = self.branch.last_revision_info()
140
 
        real_history = list(repo.iter_reverse_revision_history(
141
 
                                last_revision_id))
 
140
        real_history = []
 
141
        try:
 
142
            for revid in repo.iter_reverse_revision_history(
 
143
                    last_revision_id):
 
144
                real_history.append(revid)
 
145
        except errors.RevisionNotPresent:
 
146
            pass # Hit a ghost left hand parent
142
147
        real_history.reverse()
143
148
        if last_revno != len(real_history):
144
149
            self.fixed_history = True