/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_diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-01 16:04:44 UTC
  • mfrom: (2745.4.5 changeset)
  • Revision ID: pqm@pqm.ubuntu.com-20070901160444-hcr66zejwyy0jezc
Introduce -c option for diff and status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
57
57
        tree.commit(message='fixing hello')
58
58
        output = self.run_bzr('diff -r 2..3', retcode=1)[0]
59
59
        self.assert_('\n+hello world!' in output)
60
 
        output = self.run_bzr('diff -r last:3..last:1',
61
 
                retcode=1)[0]
 
60
        output = self.run_bzr('diff -c 3', retcode=1)[0]
 
61
        self.assert_('\n+hello world!' in output)
 
62
        output = self.run_bzr('diff -r last:3..last:1', retcode=1)[0]
 
63
        self.assert_('\n+baz' in output)
 
64
        output = self.run_bzr('diff -c last:2', retcode=1)[0]
62
65
        self.assert_('\n+baz' in output)
63
66
        self.build_tree(['moo'])
64
67
        tree.add('moo')