← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Latest bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
23
23
        merge([u'.', -1], [None, None])
24
24
        self.assertEquals(len(wt.pending_merges()), 0)
25
25
 
 
26
    def test_undo(self):
 
27
        wt = self.make_branch_and_tree('.')
 
28
        wt.commit("lala!")
 
29
        wt.commit("haha!")
 
30
        wt.commit("blabla!")
 
31
        merge([u'.', 2], [u'.', 1])
 
32
 
26
33
    def test_nocommits(self):
27
34
        self.test_pending()
28
35
        wt2 = self.make_branch_and_tree('branch2')