← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_diff.py

  • Committer: Vincent Ladeuil
  • Date: 2008-09-11 19:36:38 UTC
  • mfrom: (3703 +trunk)
  • mto: (3705.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3708.
  • Revision ID: v.ladeuil+lp@free.fr-20080911193638-wtjyc1kcmacc6t1f
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
35
35
    )
36
36
from bzrlib.errors import BinaryFile, NoDiff, ExecutableMissing
37
37
import bzrlib.osutils as osutils
 
38
import bzrlib.revision as _mod_revision
38
39
import bzrlib.transform as transform
39
40
import bzrlib.patiencediff
40
41
import bzrlib._patiencediff_py
356
357
''')
357
358
        
358
359
    def test_diff_add_files(self):
359
 
        tree1 = self.b.repository.revision_tree(None)
 
360
        tree1 = self.b.repository.revision_tree(_mod_revision.NULL_REVISION)
360
361
        tree2 = self.b.repository.revision_tree('rev-1')
361
362
        output = self.get_diff(tree1, tree2)
362
363
        # the files have the epoch time stamp for the tree in which