/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 bzrlib/tests/test_transport.py

resolve a conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
100
100
        finally:
101
101
            _set_protocol_handlers(saved_handlers)
102
102
 
 
103
    def test__combine_paths(self):
 
104
        t = Transport('/')
 
105
        self.assertEqual('/home/sarah/project/foo',
 
106
                         t._combine_paths('/home/sarah', 'project/foo'))
 
107
        self.assertEqual('/etc',
 
108
                         t._combine_paths('/home/sarah', '../../etc'))
 
109
 
103
110
 
104
111
class TestCoalesceOffsets(TestCase):
105
112