← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_pull.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_pull.py
97
97
                    self.workingtree_format)
98
98
        trunk = self.make_branch_deleting_dir('trunk')
99
99
        work = trunk.bzrdir.sprout('work', revision_id='2').open_workingtree()
100
 
        work.branch.get_config().set_user_option(
 
100
        work.branch.get_config_stack().set(
101
101
            'bzr.transform.orphan_policy', 'move')
102
102
        # Add some unversioned files in dir
103
103
        self.build_tree(['work/dir/foo',