← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree_4.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree_4.py
490
490
        subtree = self.make_branch_and_tree('dir')
491
491
        # the most primitive operation: kind
492
492
        self.assertEqual('directory', tree.kind('dir-id'))
493
 
        # a diff against the basis should give us a directory
 
493
        # a diff against the basis should give us a directory and the root (as
 
494
        # the root is new too).
494
495
        tree.lock_read()
495
496
        expected = [('dir-id',
496
497
            (None, u'dir'),
499
500
            (None, 'root'),
500
501
            (None, u'dir'),
501
502
            (None, 'directory'),
502
 
            (None, False))]
 
503
            (None, False)),
 
504
            ('root', (None, u''), True, (False, True), (None, None),
 
505
            (None, u''), (None, 'directory'), (None, 0))]
503
506
        self.assertEqual(expected, list(tree.iter_changes(tree.basis_tree(),
504
507
            specific_files=['dir'])))
505
508
        tree.unlock()