← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

Fixed log command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
1133
1133
        url = self.get_remote_url('branch/file')
1134
1134
        output = self.capture('log %s' % url)
1135
1135
        self.assertEqual(8, len(output.split('\n')))
1136
 
        
1137
 
 
1138
 
 
1139
 
 
 
1136
        copy = copy_branch(branch, 'branch2')
 
1137
        branch.commit(message='empty commit')
 
1138
        os.chdir('branch2')
 
1139
        self.run_bzr('merge', '../branch')
 
1140
        copy.commit(message='merge')
 
1141
        output = self.capture('log')