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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-22 14:42:20 UTC
  • mfrom: (7350.6.9 objects-2c)
  • Revision ID: breezy.the.bot@gmail.com-20190622144220-721zu03vr3y8tz9l
Drop file_id attribute from MergeHookParams and Tree.plan_file_merge.

Merged from https://code.launchpad.net/~jelmer/brz/objects-2c/+merge/368932

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
3264
3264
            ('unchanged', b'd\n'),
3265
3265
            ('new-a', b'e\n'),
3266
3266
            ('new-b', b'f\n'),
3267
 
        ], list(tree_a.plan_file_merge(b'file-id', tree_b)))
 
3267
        ], list(tree_a.plan_file_merge('file', tree_b)))
3268
3268
 
3269
3269
    def test_plan_file_merge_revision_tree(self):
3270
3270
        work_a = self.make_branch_and_tree('wta')
3287
3287
            ('unchanged', b'd\n'),
3288
3288
            ('new-a', b'e\n'),
3289
3289
            ('new-b', b'f\n'),
3290
 
        ], list(tree_a.plan_file_merge(b'file-id', tree_b)))
 
3290
        ], list(tree_a.plan_file_merge('file', tree_b)))
3291
3291
 
3292
3292
    def test_walkdirs(self):
3293
3293
        preview = self.get_empty_preview()