← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Alexander Belchenko
  • Date: 2012-02-29 12:35:23 UTC
  • mto: (6437.23.21 2.5)
  • mto: This revision was merged to the branch mainline in revision 6493.
  • Revision ID: bialix@ukr.net-20120229123523-giercg9s8ck7ufg1
Standalone bzr.exe includes QtTest library from PyQt4 framework that required for QBzr tests. (Alexander Belchenko, #928963)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2011 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
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import bzrdir, errors, tests
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    errors,
 
23
    tests,
 
24
    )
21
25
from bzrlib.reconcile import reconcile, Reconciler
22
 
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
24
 
from bzrlib.transport import get_transport
25
 
from bzrlib.workingtree import WorkingTree
26
 
 
27
 
 
28
 
class TestWorksWithSharedRepositories(TestCaseWithRepository):
 
26
from bzrlib.tests import per_repository
 
27
 
 
28
 
 
29
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
29
30
 
30
31
    def test_reweave_empty(self):
31
32
        # we want a repo capable format