← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
 
21
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
 
23
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
24
24
from bzrlib.tests.test_revision import make_branches
 
25
from bzrlib.check import check
25
26
 
26
27
 
27
28
class TestCommitMerge(TestCaseWithTransport):
92
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
93
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
94
95
 
95
 
        bx.check()
96
 
        by.check()
97
 
        bx.repository.check([bx.last_revision()])
98
 
        by.repository.check([by.last_revision()])
 
96
        check(bx, False)
 
97
        check(by, False)