← 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: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006, 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 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 (
21
 
    bzrdir,
22
 
    errors,
23
 
    tests,
24
 
    )
 
20
from bzrlib import bzrdir, errors, tests
25
21
from bzrlib.reconcile import reconcile, Reconciler
26
22
from bzrlib.revision import Revision
27
 
from bzrlib.tests import per_repository
 
23
from bzrlib.tests.per_repository import TestCaseWithRepository
 
24
from bzrlib.transport import get_transport
28
25
from bzrlib.workingtree import WorkingTree
29
26
 
30
27
 
31
 
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
 
28
class TestWorksWithSharedRepositories(TestCaseWithRepository):
32
29
 
33
30
    def test_reweave_empty(self):
34
31
        # we want a repo capable format