← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/reconcile.py

  • Committer: Jonathan Riddell
  • Date: 2011-06-17 09:07:12 UTC
  • mfrom: (5984 +trunk)
  • mto: (5971.2.3 bzr-gpgme)
  • mto: This revision was merged to the branch mainline in revision 6003.
  • Revision ID: jriddell@canonical.com-20110617090712-gbp520g89lwfhihn
merge in trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/reconcile.py
29
29
from bzrlib import (
30
30
    cleanup,
31
31
    errors,
 
32
    revision as _mod_revision,
32
33
    ui,
33
34
    )
34
35
from bzrlib.trace import mutter
144
145
        self._reconcile_revision_history()
145
146
 
146
147
    def _reconcile_revision_history(self):
147
 
        repo = self.branch.repository
148
148
        last_revno, last_revision_id = self.branch.last_revision_info()
149
149
        real_history = []
 
150
        graph = self.branch.repository.get_graph()
150
151
        try:
151
 
            for revid in repo.iter_reverse_revision_history(
152
 
                    last_revision_id):
 
152
            for revid in graph.iter_lefthand_ancestry(
 
153
                    last_revision_id, (_mod_revision.NULL_REVISION,)):
153
154
                real_history.append(revid)
154
155
        except errors.RevisionNotPresent:
155
156
            pass # Hit a ghost left hand parent