← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

(gz) Never raise KnownFailure in tests,
 use knownFailure method instead (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
66
66
    br2 = tree2.branch
67
67
    tree2.commit("Commit four", rev_id="b@u-0-3")
68
68
    tree2.commit("Commit five", rev_id="b@u-0-4")
69
 
    self.assertEquals(br2.last_revision(), 'b@u-0-4')
 
69
    revisions_2 = br2.revision_history()
 
70
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
70
71
 
71
72
    tree1.merge_from_branch(br2)
72
73
    tree1.commit("Commit six", rev_id="a@u-0-3")
73
74
    tree1.commit("Commit seven", rev_id="a@u-0-4")
74
75
    tree2.commit("Commit eight", rev_id="b@u-0-5")
75
 
    self.assertEquals(br2.last_revision(), 'b@u-0-5')
 
76
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
76
77
 
77
78
    tree1.merge_from_branch(br2)
78
79
    tree1.commit("Commit nine", rev_id="a@u-0-5")
79
80
    # DO NOT MERGE HERE - we WANT a GHOST.
80
 
    br1.lock_read()
81
 
    try:
82
 
        graph = br1.repository.get_graph()
83
 
        revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
84
 
            [revision.NULL_REVISION]))
85
 
        revhistory.reverse()
86
 
    finally:
87
 
        br1.unlock()
88
 
    tree2.add_parent_tree_id(revhistory[4])
 
81
    tree2.add_parent_tree_id(br1.revision_history()[4])
89
82
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
90
83
 
91
84
    return br1, br2