/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: Vincent Ladeuil
  • Date: 2011-07-07 10:20:59 UTC
  • mto: (6012.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6013.
  • Revision ID: v.ladeuil+lp@free.fr-20110707102059-xze39u9kino70aqg
Fix the test for trunk where merging into an empty branch now behave differently

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