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

  • Committer: Daniel Watkins
  • Date: 2007-11-06 09:33:05 UTC
  • mfrom: (2967 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2993.
  • Revision ID: d.m.watkins@warwick.ac.uk-20071106093305-zfef3c0jbcvunnuz
Merged bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
30
30
from bzrlib.config import BranchConfig
31
31
from bzrlib.errors import (PointlessCommit, BzrError, SigningFailed, 
32
32
                           LockContention)
33
 
from bzrlib.tests import TestCaseWithTransport
 
33
from bzrlib.tests import SymlinkFeature, TestCaseWithTransport
34
34
from bzrlib.workingtree import WorkingTree
35
35
 
36
36
 
528
528
            ('change', 'added', 'newdir'),
529
529
            ('change', 'added', 'newfile'),
530
530
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
 
531
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
531
532
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
532
533
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
533
 
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
534
534
            ('deleted', 'dirtoremove'),
535
535
            ('deleted', 'filetoremove'),
536
536
            ],
584
584
            basis.unlock()
585
585
 
586
586
    def test_commit_kind_changes(self):
587
 
        if not osutils.has_symlinks():
588
 
            raise tests.TestSkipped('Test requires symlink support')
 
587
        self.requireFeature(SymlinkFeature)
589
588
        tree = self.make_branch_and_tree('.')
590
589
        os.symlink('target', 'name')
591
590
        tree.add('name', 'a-file-id')
699
698
        self.assertEqual('Selected-file commit of merges is not supported'
700
699
                         ' yet: files bar, baz', str(err))
701
700
 
 
701
    def test_commit_ordering(self):
 
702
        """Test of corner-case commit ordering error"""
 
703
        tree = self.make_branch_and_tree('.')
 
704
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
705
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
706
        tree.commit('setup')
 
707
        self.build_tree(['a/c/d/'])
 
708
        tree.add('a/c/d')
 
709
        tree.rename_one('a/z/x', 'a/c/d/x')
 
710
        tree.commit('test', specific_files=['a/z/y'])
 
711
 
702
712
    def test_commit_no_author(self):
703
713
        """The default kwarg author in MutableTree.commit should not add
704
714
        the 'author' revision property.