/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_workingtree/test_pull.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:
80
80
        builder.start_series()
81
81
 
82
82
        # Create an empty trunk
83
 
        builder.build_snapshot('1', None, [
84
 
                ('add', ('', 'root-id', 'directory', ''))])
85
 
        builder.build_snapshot('2', ['1'], [
 
83
        builder.build_snapshot(None, [
 
84
                ('add', ('', 'root-id', 'directory', ''))],
 
85
                revision_id='1')
 
86
        builder.build_snapshot(['1'], [
86
87
                ('add', ('dir', 'dir-id', 'directory', '')),
87
 
                ('add', ('file', 'file-id', 'file', 'trunk content\n')),])
88
 
        builder.build_snapshot('3', ['2'], [
89
 
                ('unversion', 'dir-id'),])
 
88
                ('add', ('file', 'file-id', 'file', 'trunk content\n')),],
 
89
                revision_id='2')
 
90
        builder.build_snapshot(['2'], [
 
91
                ('unversion', 'dir-id'),],
 
92
                revision_id='3')
90
93
        builder.finish_series()
91
94
        return builder.get_branch()
92
95