/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: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_ancestry.py
18
18
 
19
19
from breezy.tests import TestCaseWithTransport
20
20
 
 
21
 
21
22
class TestAncestry(TestCaseWithTransport):
22
23
 
23
24
    def _build_branches(self):
34
35
        a_wt.commit('modified A/foo', rev_id=b'A2')
35
36
 
36
37
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
37
 
            b_wt.branch.get_rev_id(1))
 
38
                               b_wt.branch.get_rev_id(1))
38
39
        a_wt.commit('merged B into A', rev_id=b'A3')
39
40
        return a_wt, b_wt
40
41