← 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: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
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
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
20
20
from bzrlib import bzrdir, errors, tests
21
21
from bzrlib.reconcile import reconcile, Reconciler
22
22
from bzrlib.revision import Revision
23
 
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
 
23
from bzrlib.tests.per_repository import TestCaseWithRepository
24
24
from bzrlib.transport import get_transport
25
25
from bzrlib.workingtree import WorkingTree
26
26
 
46
46
 
47
47
 
48
48
class TestReconciler(tests.TestCaseWithTransport):
49
 
    
 
49
 
50
50
    def test_reconciler_with_no_branch(self):
51
51
        repo = self.make_repository('repo')
52
52
        reconciler = Reconciler(repo.bzrdir)