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

  • Committer: Gustav Hartvigsson
  • Date: 2021-01-11 20:19:38 UTC
  • mfrom: (7526.3.2 work)
  • Revision ID: gustav.hartvigsson@gmail.com-20210111201938-omr9wjz3qdgyxe8k
Merged lp:brz

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
18
18
 
19
19
import os
20
20
 
21
 
from ..conflicts import TextConflict
 
21
from ..bzr.conflicts import TextConflict
22
22
from .. import (
23
23
    errors,
24
24
    merge as _mod_merge,
169
169
                b'e\n', 'test/foo')
170
170
 
171
171
    def get_limbodir_deletiondir(self, wt):
172
 
        transform = wt.get_transform()
 
172
        transform = wt.transform()
173
173
        limbodir = transform._limbodir
174
174
        deletiondir = transform._deletiondir
175
175
        transform.finalize()