/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/blackbox/test_log.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
108
108
        self.assertTrue('branch nick: branch2\n' in log)
109
109
        self.assertTrue('branch nick: branch1\n' not in log)
110
110
        
 
111
    def test_log_nonexistent_file(self):
 
112
        # files that don't exist in either the basis tree or working tree
 
113
        # should give an error
 
114
        wt = self.make_branch_and_tree('.')
 
115
        out, err = self.run_bzr('log', 'does-not-exist', retcode=3)
 
116
        self.assertContainsRe(
 
117
            err, 'Path does not have any revision history: does-not-exist')
111
118
 
112
119
class TestLogMerges(ExternalBase):
113
120