/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: Jelmer Vernooij
  • Date: 2017-11-16 00:39:04 UTC
  • mto: This revision was merged to the branch mainline in revision 6818.
  • Revision ID: jelmer@jelmer.uk-20171116003904-p6lcb827m6thxbzd
Migrate some build_snapshot code over to having revision_id as keyword argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_merger.py
125
125
        # the modification should be considered a conflict
126
126
        builder = self.make_branch_builder('test')
127
127
        builder.start_series()
128
 
        builder.build_snapshot('BASE-id', None,
 
128
        builder.build_snapshot(None,
129
129
            [('add', ('', None, 'directory', None)),
130
130
             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
131
 
            ])
 
131
            ], revision_id='BASE-id')
132
132
        # Delete 'b\n'
133
 
        builder.build_snapshot('OTHER-id', ['BASE-id'],
134
 
            [('modify', ('foo-id', 'a\nc\nd\ne\n'))])
 
133
        builder.build_snapshot(['BASE-id'],
 
134
            [('modify', ('foo-id', 'a\nc\nd\ne\n'))],
 
135
            revision_id='OTHER-id')
135
136
        # Modify 'b\n', add 'X\n'
136
 
        builder.build_snapshot('THIS-id', ['BASE-id'],
137
 
            [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))])
 
137
        builder.build_snapshot(['BASE-id'],
 
138
            [('modify', ('foo-id', 'a\nb2\nc\nd\nX\ne\n'))],
 
139
            revision_id='THIS-id')
138
140
        builder.finish_series()
139
141
        branch = builder.get_branch()
140
142
        this_tree = branch.controldir.create_workingtree()