/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_merge_core.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge_core.py
57
57
            wt.lock_write()
58
58
            wt.set_root_id(self.tree_root)
59
59
            wt.flush()
60
 
            tt = wt.get_transform()
 
60
            tt = wt.transform()
61
61
            return wt, tt
62
62
        self.base, self.base_tt = wt('base')
63
63
        self.this, self.this_tt = wt('this')