/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/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2011-08-30 10:54:28 UTC
  • mfrom: (5609.48.9 2.3)
  • mto: (6015.28.2 2.4)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: john@arbash-meinel.com-20110830105428-3xu4hkvizhfj5k11
Merge 2.3 into 2.4, and fix up the conflict for resolving bug #835035

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
66
66
            revno = old_revno
67
67
        new_revno = revno - 1
68
68
 
69
 
        revid_iterator = branch.repository.iter_reverse_revision_history(
70
 
                            old_tip)
71
69
        cur_revno = old_revno
72
70
        new_revision_id = old_tip
73
71
        graph = branch.repository.get_graph()
74
 
        for rev_id in revid_iterator:
 
72
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
75
73
            if cur_revno == new_revno:
76
74
                new_revision_id = rev_id
77
75
                break