/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/plugins/quilt/tests/test_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/quilt/tests/test_merge.py
24
24
import shutil
25
25
 
26
26
from .... import (
 
27
    bedding,
27
28
    config,
28
29
    errors,
29
30
    trace,
117
118
        self.build_tree(
118
119
            ['a/debian/', 'a/debian/patches/', 'a/debian/source/', 'a/.pc/'])
119
120
        self.build_tree_contents([
120
 
            ('a/.pc/.quilt_patches', 'debian/patches'),
121
 
            ('a/.pc/.version', '2'),
 
121
            ('a/.pc/.quilt_patches', 'debian/patches\n'),
 
122
            ('a/.pc/.version', '2\n'),
122
123
            ('a/debian/source/format', '3.0 (quilt)'),
123
124
            ('a/debian/patches/series', 'patch1\n'),
124
125
            ('a/debian/patches/patch1', TRIVIAL_PATCH)])
164
165
        tree_a.smart_add([tree_a.basedir])
165
166
        tree_a.commit('initial')
166
167
 
167
 
        config.ensure_config_dir_exists()
 
168
        bedding.ensure_config_dir_exists()
168
169
        config.GlobalStack().set('quilt.tree_policy', 'applied')
169
170
 
170
171
        tree_a.branch.create_checkout("b")
178
179
 
179
180
        self.build_tree(['a/debian/', 'a/debian/patches/', 'a/.pc/'])
180
181
        self.build_tree_contents([
181
 
            ('a/.pc/.quilt_patches', 'debian/patches'),
182
 
            ('a/.pc/.version', '2'),
 
182
            ('a/.pc/.quilt_patches', 'debian/patches\n'),
 
183
            ('a/.pc/.version', '2\n'),
183
184
            ('a/debian/patches/series', 'patch1\n'),
184
185
            ('a/debian/patches/patch1', TRIVIAL_PATCH)])
185
186
        tree_a.smart_add([tree_a.basedir])
201
202
 
202
203
        self.build_tree(['a/debian/', 'a/debian/patches/', 'a/debian/source/', 'a/.pc/'])
203
204
        self.build_tree_contents([
204
 
            ('a/.pc/.quilt_patches', 'debian/patches'),
205
 
            ('a/.pc/.version', '2'),
 
205
            ('a/.pc/.quilt_patches', 'debian/patches\n'),
 
206
            ('a/.pc/.version', '2\n'),
206
207
            ('a/debian/source/format', '3.0 (quilt)'),
207
208
            ('a/debian/patches/series', 'patch1\n'),
208
209
            ('a/debian/patches/patch1', TRIVIAL_PATCH)])
226
227
 
227
228
        self.build_tree(['a/debian/', 'a/debian/patches/', 'a/debian/source/', 'a/.pc/'])
228
229
        self.build_tree_contents([
229
 
            ('a/.pc/.quilt_patches', 'debian/patches'),
230
 
            ('a/.pc/.version', '2'),
 
230
            ('a/.pc/.quilt_patches', 'debian/patches\n'),
 
231
            ('a/.pc/.version', '2\n'),
231
232
            ('a/debian/source/format', '3.0 (quilt)'),
232
233
            ('a/debian/patches/series', 'patch1\n'),
233
234
            ('a/debian/patches/patch1', TRIVIAL_PATCH)])
247
248
        tree_a.get_config_stack().set('quilt.smart_merge', False)
248
249
        self.build_tree(['a/debian/', 'a/debian/patches/', 'a/.pc/'])
249
250
        self.build_tree_contents([
250
 
            ('a/.pc/.quilt_patches', 'debian/patches'),
251
 
            ('a/.pc/.version', '2'),
 
251
            ('a/.pc/.quilt_patches', 'debian/patches\n'),
 
252
            ('a/.pc/.version', '2\n'),
252
253
            ('a/debian/patches/series', 'patch1\n'),
253
254
            ('a/debian/patches/patch1', TRIVIAL_PATCH),
254
255
            ("a/a", "")])