/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 breezy/tests/blackbox/test_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-01 19:35:12 UTC
  • mfrom: (7490.29.10 work)
  • mto: This revision was merged to the branch mainline in revision 7507.
  • Revision ID: jelmer@jelmer.uk-20200601193512-yx77edrbrs12d0qy
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_diff.py
358
358
            "=== removed file 'a'\nBinary files old/a and new/a differ\n",
359
359
            output[0])
360
360
 
 
361
    def test_moved_away(self):
 
362
        # pad.lv/1880354
 
363
        tree = self.make_branch_and_tree('.')
 
364
        self.build_tree_contents([('a', 'asdf\n')])
 
365
        tree.add(['a'])
 
366
        tree.commit('add a')
 
367
        tree.rename_one('a', 'b')
 
368
        self.build_tree_contents([('a', 'qwer\n')])
 
369
        tree.add('a')
 
370
        output, error = self.run_bzr('diff -p0', retcode=1)
 
371
        self.assertEqualDiff("""\
 
372
=== added file 'a'
 
373
--- a\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
374
+++ a\tYYYY-MM-DD HH:MM:SS +ZZZZ
 
375
@@ -0,0 +1,1 @@
 
376
+qwer
 
377
 
 
378
=== renamed file 'a' => 'b'
 
379
""", subst_dates(output))
 
380
 
361
381
 
362
382
class TestCheckoutDiff(TestDiff):
363
383