/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_ancestry.py

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_ancestry.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from bzrlib.branchbuilder import BranchBuilder
19
 
from bzrlib.tests import TestCaseWithMemoryTransport
20
 
from bzrlib.tests.matchers import MatchesAncestry
 
18
from ..branchbuilder import BranchBuilder
 
19
from . import TestCaseWithMemoryTransport
 
20
from .matchers import MatchesAncestry
21
21
 
22
22
 
23
23
class TestAncestry(TestCaseWithMemoryTransport):
29
29
        rev_id_two = builder.build_commit()
30
30
        branch = builder.get_branch()
31
31
        self.assertThat([rev_id_one, rev_id_two],
32
 
            MatchesAncestry(branch.repository, rev_id_two))
 
32
                        MatchesAncestry(branch.repository, rev_id_two))
33
33
        self.assertThat([rev_id_one],
34
 
            MatchesAncestry(branch.repository, rev_id_one))
 
34
                        MatchesAncestry(branch.repository, rev_id_one))
35
35
 
36
36
# TODO: check that ancestry is updated to include indirectly merged revisions