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

  • Committer: Aaron Bentley
  • Date: 2009-12-07 21:46:28 UTC
  • mfrom: (4871 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4873.
  • Revision ID: aaron@aaronbentley.com-20091207214628-yifwgux0fn4x3bo4
Merge bzr.dev into merge-i-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
1378
1378
                                                     'newname')
1379
1379
        self.assertContainsRe(old_path, 'old/oldname$')
1380
1380
        self.assertEqual(0, os.stat(old_path).st_mtime)
1381
 
        self.assertContainsRe(new_path, 'new/newname$')
 
1381
        self.assertContainsRe(new_path, 'tree/newname$')
1382
1382
        self.assertFileEqual('oldcontent', old_path)
1383
1383
        self.assertFileEqual('newcontent', new_path)
1384
1384
        if osutils.host_os_dereferences_symlinks():