← 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: Patch Queue Manager
  • Date: 2012-01-28 13:24:39 UTC
  • mfrom: (6450.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120128132439-phvlss4cq7bf5rji
(jelmer) Merge the 2.5 branch. (Jelmer Vernooij)

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')