/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: 2018-05-22 02:05:12 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 6992.
  • Revision ID: jelmer@jelmer.uk-20180522020512-btpj2jchdlehi3en
Add more bees.

Show diffs side-by-side

added added

removed removed

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