~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

• browse files at revision 4988.10.5
• compare with another revision
• download diff
• download tarball
• view history from revision 4988.10.5

• reverse the comparison (4988.10.5 to 6351.2.2)
• stop comparing with revision 6351.2.2

Show diffs side-by-side

added

removed

bzrlib/tests/test_reconcile.py

1

 

# Copyright (C) 2006, 2008-2011 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

 

from bzrlib.tests import per_repository

27

 

 

28

 

 

29

 

class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):

 

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):

30

29

 

31

30

    def test_reweave_empty(self):

32

31

        # we want a repo capable format

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1