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

  • Committer: Robert Collins
  • Date: 2009-08-26 03:20:32 UTC
  • mfrom: (4637 +trunk)
  • mto: (4634.6.2 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: robertc@robertcollins.net-20090826032032-mx5kiog3eihaoy13
Merge and cherrypick outstanding 2.0 relevant patches from bzr.dev: Up to rev
4637, then 4639,4641,4643,4646,4649,4650,4651. (Robert Collins)

Log messages of the incorporated fixes:

revno: 4651 [merge]
  (robertc) Enable commit via record_iter_changes for specific file
        comments. (Robert Collins)

revno: 4650 [merge]
  Fix shelve on windows. (Robert Collins, #305006)

revno: 4649 [merge]
  (robertc) Make iter_changes produce output that is always safe to
        generate inventory deltas of in the same direction as the
        changes. (Robert Collins, #347649)

revno: 4646 [merge]
  (mbp) developer documentation about content filtering

revno: 4643 [merge]
  (mbp) small tweaks to release documentation

revno: 4641 [merge]
  (abentley) Shelve will not remove tree root.

revno: 4639 [merge]
  (andrew) Fix 'Revision ... not present' errors when upgrading stacked
        branches.

revno: 4637 [merge]
  Fix upgrade of branches in repositories.

revno: 4636 [merge]
  (mbp) fix crash formatting CannotBindAddress

revno: 4635 [merge]
  (robertc) Fix many locking errors on windows due to a small bug in
        merge.transform_tree. (Robert Collins)

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()