← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

Lalos fix to diff -r x..y ../path/to/branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
160
160
        self.run_bzr('mv', 'a', 'c', 'subdir')
161
161
        self.run_bzr('mv', 'subdir/a', 'subdir/newa')
162
162
 
163
 
 
164
163
    def test_main_version(self):
165
164
        """Check output from version command and master option is reasonable"""
166
165
        # output is intentionally passed through to stdout so that we
185
184
        test.runbzr('add goodbye')
186
185
        test.runbzr('commit -m setup goodbye')
187
186
 
 
187
    def test_diff(self):
 
188
        self.example_branch()
 
189
        file('hello', 'wt').write('hello world!')
 
190
        self.runbzr('commit -m fixing hello')
 
191
        output = self.runbzr('diff -r 2..3', backtick=1)
 
192
        self.assert_('\n+hello world!' in output)
 
193
        output = self.runbzr('diff -r last:3..last:1', backtick=1)
 
194
        self.assert_('\n+baz' in output)
 
195
 
188
196
    def test_revert(self):
189
197
        self.example_branch()
190
198
        file('hello', 'wt').write('bar')
257
265
        os.chdir('../b')
258
266
        self.runbzr('pull ../a')
259
267
        assert a.revision_history()[-1] == b.revision_history()[-1]
260
 
 
 
268
        
261
269
    def test_add_reports(self):
262
270
        """add command prints the names of added files."""
263
271
        b = Branch.initialize('.')