← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

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, 2009, 2010 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
26
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
24
 
from bzrlib.transport import get_transport
 
27
from bzrlib.tests import per_repository
25
28
from bzrlib.workingtree import WorkingTree
26
29
 
27
30
 
28
 
class TestWorksWithSharedRepositories(TestCaseWithRepository):
 
31
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
29
32
 
30
33
    def test_reweave_empty(self):
31
34
        # we want a repo capable format