← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

 * The internal storage of history, and logical branch identity have now
   been split into Branch, and Repository. The common locking and file 
   management routines are now in bzrlib.lockablefiles. 
   (Aaron Bentley, Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
12
12
 
13
13
class TestMerge(TestCaseInTempDir):
14
14
    """Test appending more than one revision"""
 
15
 
15
16
    def test_pending(self):
16
17
        br = Branch.initialize(u".")
17
18
        commit(br, "lala!")
52
53
        br1, br2 = self.test_pending_with_null()
53
54
        commit(br1, "blah")
54
55
        last = br1.last_revision()
55
 
        self.assertEquals(common_ancestor(last, last, br1), last)
 
56
        self.assertEquals(common_ancestor(last, last, br1.repository), last)
56
57
 
57
58
    def test_create_rename(self):
58
59
        """Rename an inventory entry while creating the file"""