/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-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
103
103
        trunk = self.make_branch_deleting_dir('trunk')
104
104
        work = trunk.controldir.sprout('work', revision_id='2').open_workingtree()
105
105
        work.branch.get_config_stack().set(
106
 
            'bzr.transform.orphan_policy', 'move')
 
106
            'transform.orphan_policy', 'move')
107
107
        # Add some unversioned files in dir
108
108
        self.build_tree(['work/dir/foo',
109
109
                         'work/dir/subdir/',