/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_workingtree/test_merge_from_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-22 22:46:24 UTC
  • mfrom: (7490.40.105 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200822224624-om4a4idsr7cn8jew
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_merge_from_branch.py
101
101
        tree_a.lock_read()
102
102
        self.addCleanup(tree_a.unlock)
103
103
        changes = list(tree_a.iter_changes(tree_a.basis_tree()))
104
 
        self.assertEqual(1, len(changes))
 
104
        self.assertEqual(1, len(changes), changes)
105
105
 
106
106
    def test_merge_type(self):
107
107
        this = self.make_branch_and_tree('this')