1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
# Copyright (C) 2006-2010 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for reconciliation of repositories."""
from bzrlib.tests.per_repository import (
TestCaseWithRepository,
)
class TestRepeatedReconcile(TestCaseWithRepository):
def test_trivial_two_reconciles_no_error(self):
tree = self.make_branch_and_tree('.')
tree.commit('first post')
tree.branch.repository.reconcile(thorough=True)
tree.branch.repository.reconcile(thorough=True)
|