/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/per_branch/test_update.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 00:16:27 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7318.
  • Revision ID: jelmer@jelmer.uk-20190304001627-v6u7o6pf97tukhek
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_update.py
64
64
            # old branch, cant test.
65
65
            return
66
66
        # commit to the child to make the last rev not-None and skew it from master.
67
 
        child_tree.commit('foo', rev_id=b'foo', allow_pointless=True, local=True)
 
67
        child_tree.commit('foo', rev_id=b'foo',
 
68
                          allow_pointless=True, local=True)
68
69
        # commit to the master making the child tree out of date and not a prefix.
69
70
        master_tree.commit('bar', rev_id=b'bar', allow_pointless=True)
70
71
        self.assertEqual(b'foo', child_tree.branch.update())
78
79
        except errors.TagsNotSupported:
79
80
            # Tags not supported
80
81
            raise tests.TestNotApplicable("only triggered from branches with"
81
 
                " tags")
 
82
                                          " tags")
82
83
        readonly_branch1 = branch.Branch.open('readonly+' + tree1.branch.base)
83
84
        tree2 = tree1.controldir.sprout('tree2').open_workingtree()
84
85
        try: