← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Martin Pool
  • Date: 2005-08-25 00:47:04 UTC
  • Revision ID: mbp@sourcefrog.net-20050825004704-e3c75123f29539bf
- expose 'find-merge-base' as a new expert command,
  to help in debugging merges

  move UnrelatedBranches exception into bzrlib.errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib.selftest import TestCaseInTempDir
18
 
 
19
 
 
20
 
class TestAppendRevisions(TestCaseInTempDir):
 
17
from bzrlib.selftest import InTempDir
 
18
 
 
19
 
 
20
 
 
21
class TestAppendRevisions(InTempDir):
21
22
    """Test appending more than one revision"""
22
23
    def test_append_revisions(self):
23
24
        from bzrlib.branch import Branch
26
27
        self.assertEquals(br.revision_history(), ["rev1",])
27
28
        br.append_revision("rev2", "rev3")
28
29
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
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
 
30
        
 
31
 
 
32
 
 
33
TEST_CLASSES = [
 
34
    TestAppendRevisions,
 
35
    ]