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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 17:46:48 UTC
  • mfrom: (6816.2.3 branch-builder-order)
  • Revision ID: jelmer@jelmer.uk-20171119174648-tteawslwap0zfs5i
Merge lp:~jelmer/brz/branch-builder-order

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
1496
1496
    def make_merged_branch(self):
1497
1497
        builder = self.make_branch_builder('source')
1498
1498
        builder.start_series()
1499
 
        builder.build_snapshot('a@cset-0-1', None, [
 
1499
        builder.build_snapshot(None, [
1500
1500
            ('add', ('', 'root-id', 'directory', None)),
1501
1501
            ('add', ('file', 'file-id', 'file', 'original content\n')),
1502
 
            ])
1503
 
        builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
 
1502
            ], revision_id='a@cset-0-1')
 
1503
        builder.build_snapshot(['a@cset-0-1'], [
1504
1504
            ('modify', ('file-id', 'new-content\n')),
1505
 
            ])
1506
 
        builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1507
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1508
 
            ])
1509
 
        builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1510
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1511
 
            ])
 
1505
            ], revision_id='a@cset-0-2a')
 
1506
        builder.build_snapshot(['a@cset-0-1'], [
 
1507
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
 
1508
            ], revision_id='a@cset-0-2b')
 
1509
        builder.build_snapshot(['a@cset-0-2a', 'a@cset-0-2b'], [
 
1510
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
 
1511
            ], revision_id='a@cset-0-3')
1512
1512
        builder.finish_series()
1513
1513
        self.b1 = builder.get_branch()
1514
1514
        self.b1.lock_read()