← 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: Alexander Belchenko
  • Date: 2006-07-31 16:12:57 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060731161257-91a231523255332c
new official bzr.ico

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
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
20
20
 
21
21
from bzrlib.tests import TestCaseWithTransport
22
22
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError, PointlessCommit
 
23
from bzrlib.errors import PointlessCommit, BzrError
24
24
from bzrlib.tests.test_revision import make_branches
25
 
from bzrlib.check import check
26
25
 
27
26
 
28
27
class TestCommitMerge(TestCaseWithTransport):
93
92
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
94
93
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
95
94
 
96
 
        check(bx, False)
97
 
        check(by, False)
 
95
        bx.check()
 
96
        by.check()
 
97
        bx.repository.check([bx.last_revision()])
 
98
        by.repository.check([by.last_revision()])