← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_versioning.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_versioning.py
40
40
 
41
41
        from bzrlib.diff import compare_trees
42
42
        from bzrlib.branch import Branch
43
 
        b = Branch.open('.')
 
43
        b = Branch.open(u'.')
44
44
        
45
45
        delta = compare_trees(b.basis_tree(), b.working_tree())
46
46
 
65
65
 
66
66
        from bzrlib.diff import compare_trees
67
67
        from bzrlib.branch import Branch
68
 
        b = Branch.open('.')
 
68
        b = Branch.open(u'.')
69
69
        
70
70
        delta = compare_trees(b.basis_tree(), b.working_tree())
71
71
 
94
94
        self.failUnless(os.path.isdir('a/b/dir'))
95
95
 
96
96
        from bzrlib.diff import compare_trees
97
 
        b = Branch.open('.')
 
97
        b = Branch.open(u'.')
98
98
        b_a = Branch.open('a')
99
99
        b_b = Branch.open('a/b')
100
100
        
123
123
        from bzrlib.errors import NotVersionedError
124
124
        from bzrlib.workingtree import WorkingTree
125
125
 
126
 
        b = Branch.initialize('.')
 
126
        b = Branch.initialize(u'.')
127
127
 
128
128
        self.build_tree(['foo/',
129
129
                         'foo/hello'])
138
138
        """After all the above changes, run the check and upgrade commands.
139
139
 
140
140
        The upgrade should be a no-op."""
141
 
        b = Branch.open('.')
 
141
        b = Branch.open(u'.')
142
142
        mutter('branch has %d revisions', b.revno())
143
143
        
144
144
        mutter('check branch...')
156
156
        self.build_tree(['a/', 'b/'])
157
157
        
158
158
        run_bzr('init')
159
 
        b = Branch.open('.')
 
159
        b = Branch.open(u'.')
160
160
        
161
161
        for fn in ('a/one', 'b/two', 'top'):
162
162
            file(fn, 'w').write('old contents')