~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.py

Merge from mbp.

Show diffs side-by-side

added added

removed removed

Lines of Context:
40
40
        from bzrlib.add import smart_add
41
41
        from bzrlib.branch import Branch
42
42
 
43
 
        b = Branch.initialize('.')
 
43
        b = Branch.initialize(u'.')
44
44
 
45
45
        self.build_tree(['one', 'two', 'three'])
46
 
        smart_add('.')
 
46
        smart_add(u'.')
47
47
        commit(b, "Commit one", rev_id="a@u-0-0")
48
48
        self.build_tree(['four'])
49
 
        smart_add('.')
 
49
        smart_add(u'.')
50
50
        commit(b, "Commit two", rev_id="a@u-0-1")
51
51
        self.build_tree(['five'])
52
 
        smart_add('.')
 
52
        smart_add(u'.')
53
53
        commit(b, "Commit three", rev_id="a@u-0-2")
54
54
 
55
55
        # We should now have a few files, lets try to
73
73
        
74
74
        # Make sure smart_add can handle having a bogus
75
75
        # file in the way
76
 
        smart_add('.')
 
76
        smart_add(u'.')
77
77
        verify_status(self, b,
78
78
                          ['added:\n',
79
79
                           '  six\n',