← 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-01-31 15:43:17 UTC
  • mfrom: (6437.3.28 2.5)
  • mto: (6437.23.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6458.
  • Revision ID: jelmer@samba.org-20120131154317-y028tz0r9xesvn9p
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1765
1765
        merge_modified = this.wt.merge_modified()
1766
1766
        self.assertSubset(merge_modified, modified)
1767
1767
        self.assertEqual(len(merge_modified), len(modified))
1768
 
        file(this.wt.id2abspath('a'), 'wb').write('booga')
 
1768
        with file(this.wt.id2abspath('a'), 'wb') as f: f.write('booga')
1769
1769
        modified.pop(0)
1770
1770
        merge_modified = this.wt.merge_modified()
1771
1771
        self.assertSubset(merge_modified, modified)
1887
1887
        os.mkdir('a')
1888
1888
        a = BzrDir.create_standalone_workingtree('a')
1889
1889
        os.mkdir('a/foo')
1890
 
        file('a/foo/bar', 'wb').write('contents')
 
1890
        with file('a/foo/bar', 'wb') as f: f.write('contents')
1891
1891
        os.symlink('a/foo/bar', 'a/foo/baz')
1892
1892
        a.add(['foo', 'foo/bar', 'foo/baz'])
1893
1893
        a.commit('initial commit')