← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Robert Collins
  • Date: 2005-08-25 10:04:51 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825100451-b01297285491ba46
make a default merge choose a sane base with branch.common_ancestor

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
17
17
from bzrlib.selftest import InTempDir
18
18
 
19
19
 
20
 
 
21
20
class TestAppendRevisions(InTempDir):
22
21
    """Test appending more than one revision"""
23
 
    def runTest(self):
 
22
    def test_append_revisions(self):
24
23
        from bzrlib.branch import Branch
25
24
        br = Branch(".", init=True)
26
25
        br.append_revision("rev1")
27
26
        self.assertEquals(br.revision_history(), ["rev1",])
28
27
        br.append_revision("rev2", "rev3")
29
28
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
30
 
        
31
 
 
32
 
 
33
 
TEST_CLASSES = [
34
 
    TestAppendRevisions,
35
 
    ]
 
29
 
 
30
 
 
31
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
 
32
#         >>> from bzrlib.commit import commit
 
33
#         >>> bzrlib.trace.silent = True
 
34
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
 
35
#         >>> br1.add('foo')
 
36
#         >>> br1.add('bar')
 
37
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
 
38
#         >>> br2 = ScratchBranch()
 
39
#         >>> br2.update_revisions(br1)
 
40
#         Added 2 texts.
 
41
#         Added 1 inventories.
 
42
#         Added 1 revisions.
 
43
#         >>> br2.revision_history()
 
44
#         [u'REVISION-ID-1']
 
45
#         >>> br2.update_revisions(br1)
 
46
#         Added 0 revisions.
 
47
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
 
48
#         True