/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: Aaron Bentley
  • Date: 2008-02-24 16:42:13 UTC
  • mfrom: (3234 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
259
259
        output = self.run_bzr('diff -r 1.. branch1', retcode=1)
260
260
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
261
261
 
 
262
    def test_diff_to_working_tree_in_subdir(self):
 
263
        self.example_branch2()
 
264
        self.build_tree_contents([('branch1/file1', 'new line')])
 
265
        os.mkdir('branch1/dir1')
 
266
        os.chdir('branch1/dir1')
 
267
        output = self.run_bzr('diff -r 1..', retcode=1)
 
268
        self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
269
 
262
270
    def test_diff_across_rename(self):
263
271
        """The working tree path should always be considered for diffing"""
264
272
        tree = self.make_example_branch()