/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_commit.py

merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_commit.py
333
333
        out, err = self.run_bzr('commit -m added', working_dir='this')
334
334
        self.assertEqual(b'', out)
335
335
        self.assertEqual({
336
 
            b'Committing to: %s/' % osutils.pathjoin(osutils.getcwd(), 'this'),
 
336
            b'Committing to: %s/' % osutils.pathjoin(osutils.getcwd().encode('utf-8'), 'this'),
337
337
            b'modified filetomodify',
338
338
            b'added newdir',
339
339
            b'added newfile',
421
421
        # work as a merge
422
422
        # retcode 1 as we expect a text conflict
423
423
        self.run_bzr('update u1', retcode=1)
424
 
        self.assertFileEqual('''\
 
424
        self.assertFileEqual(b'''\
425
425
<<<<<<< TREE
426
426
first offline change in u1
427
427
=======