/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: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_ancestry.py
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