~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)
69
71
        cur_revno = old_revno
70
72
        new_revision_id = old_tip
71
73
        graph = branch.repository.get_graph()
72
 
        for rev_id in graph.iter_lefthand_ancestry(old_tip):
 
74
        for rev_id in revid_iterator:
73
75
            if cur_revno == new_revno:
74
76
                new_revision_id = rev_id
75
77
                break