/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: John Arbash Meinel
  • Date: 2006-07-11 15:05:36 UTC
  • mfrom: (1850 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1851.
  • Revision ID: john@arbash-meinel.com-20060711150536-a0dcb33b1581c044
NEWS about fixing #43689

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
23
23
 
24
24
import bzrlib
25
25
from bzrlib.branch import Branch
 
26
from bzrlib import workingtree
26
27
from bzrlib.tests.blackbox import ExternalBase
27
28
 
28
29
 
173
174
        output = self.run_bzr_captured(['diff', '-r', '1..', 'branch1'], retcode=1)
174
175
        self.assertTrue('\n-original line\n+new line\n' in output[0])
175
176
 
 
177
    def test_diff_across_rename(self):
 
178
        """The working tree path should always be considered for diffing"""
 
179
        self.make_example_branch()
 
180
        self.run_bzr('diff', '-r', '0..1', 'hello', retcode=1)
 
181
        wt = workingtree.WorkingTree.open_containing('.')[0]
 
182
        wt.rename_one('hello', 'hello1')
 
183
        self.run_bzr('diff', 'hello1', retcode=1)
 
184
        self.run_bzr('diff', '-r', '0..1', 'hello1', retcode=1)
 
185
 
176
186
 
177
187
class TestCheckoutDiff(TestDiff):
178
188