← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1761
1761
        merge_modified = this.wt.merge_modified()
1762
1762
        self.assertSubset(merge_modified, modified)
1763
1763
        self.assertEqual(len(merge_modified), len(modified))
1764
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1764
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1765
1765
        modified.pop(0)
1766
1766
        merge_modified = this.wt.merge_modified()
1767
1767
        self.assertSubset(merge_modified, modified)
1883
1883
        os.mkdir('a')
1884
1884
        a = BzrDir.create_standalone_workingtree('a')
1885
1885
        os.mkdir('a/foo')
1886
 
        file('a/foo/bar', 'wb').write('contents')
 
1886
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1887
1887
        os.symlink('a/foo/bar', 'a/foo/baz')
1888
1888
        a.add(['foo', 'foo/bar', 'foo/baz'])
1889
1889
        a.commit('initial commit')
3634
3634
        self.assertRaises(NotImplementedError, tt.new_orphan, 'foo', 'bar')
3635
3635
 
3636
3636
    def _set_orphan_policy(self, wt, policy):
3637
 
        wt.branch.get_config().set_user_option('bzr.transform.orphan_policy',
 
3637
        wt.branch.get_config_stack().set('bzr.transform.orphan_policy',
3638
3638
                                               policy)
3639
3639
 
3640
3640
    def _prepare_orphan(self, wt):