/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: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
83
83
 
84
84
        # Create an empty trunk
85
85
        builder.build_snapshot(None, [
86
 
                ('add', ('', b'root-id', 'directory', ''))],
87
 
                revision_id=b'1')
 
86
            ('add', ('', b'root-id', 'directory', ''))],
 
87
            revision_id=b'1')
88
88
        builder.build_snapshot([b'1'], [
89
 
                ('add', ('dir', b'dir-id', 'directory', '')),
90
 
                ('add', ('file', b'file-id', 'file', b'trunk content\n')),],
91
 
                revision_id=b'2')
 
89
            ('add', ('dir', b'dir-id', 'directory', '')),
 
90
            ('add', ('file', b'file-id', 'file', b'trunk content\n')), ],
 
91
            revision_id=b'2')
92
92
        builder.build_snapshot([b'2'], [
93
 
                ('unversion', 'dir'),],
94
 
                revision_id=b'3')
 
93
            ('unversion', 'dir'), ],
 
94
            revision_id=b'3')
95
95
        builder.finish_series()
96
96
        return builder.get_branch()
97
97
 
99
99
        if not self.workingtree_format.missing_parent_conflicts:
100
100
            raise tests.TestSkipped(
101
101
                '%r does not support missing parent conflicts' %
102
 
                    self.workingtree_format)
 
102
                self.workingtree_format)
103
103
        trunk = self.make_branch_deleting_dir('trunk')
104
 
        work = trunk.controldir.sprout('work', revision_id=b'2').open_workingtree()
 
104
        work = trunk.controldir.sprout(
 
105
            'work', revision_id=b'2').open_workingtree()
105
106
        work.branch.get_config_stack().set(
106
107
            'transform.orphan_policy', 'move')
107
108
        # Add some unversioned files in dir