/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/blackbox/test_ancestry.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ancestry.py
22
22
 
23
23
    def _build_branches(self):
24
24
        a_wt = self.make_branch_and_tree('A')
25
 
        self.build_tree_contents([('A/foo', '1111\n')])
 
25
        self.build_tree_contents([('A/foo', b'1111\n')])
26
26
        a_wt.add('foo')
27
 
        a_wt.commit('added foo', rev_id='A1')
 
27
        a_wt.commit('added foo', rev_id=b'A1')
28
28
 
29
29
        b_wt = a_wt.controldir.sprout('B').open_workingtree()
30
 
        self.build_tree_contents([('B/foo', '1111\n22\n')])
31
 
        b_wt.commit('modified B/foo', rev_id='B1')
 
30
        self.build_tree_contents([('B/foo', b'1111\n22\n')])
 
31
        b_wt.commit('modified B/foo', rev_id=b'B1')
32
32
 
33
 
        self.build_tree_contents([('A/foo', '000\n1111\n')])
34
 
        a_wt.commit('modified A/foo', rev_id='A2')
 
33
        self.build_tree_contents([('A/foo', b'000\n1111\n')])
 
34
        a_wt.commit('modified A/foo', rev_id=b'A2')
35
35
 
36
36
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
37
37
            b_wt.branch.get_rev_id(1))
38
 
        a_wt.commit('merged B into A', rev_id='A3')
 
38
        a_wt.commit('merged B into A', rev_id=b'A3')
39
39
        return a_wt, b_wt
40
40
 
41
41
    def _check_ancestry(self, location='', result=None):