/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: Vincent Ladeuil
  • Date: 2007-09-24 15:01:26 UTC
  • mfrom: (2853 +trunk)
  • mto: (2885.1.1 140432)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20070924150126-nll7i0385kisklyj
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
70
70
    def renamed(self, change, old_path, new_path):
71
71
        self.calls.append(('renamed', change, old_path, new_path))
72
72
 
 
73
    def is_verbose(self):
 
74
        return True
 
75
 
73
76
 
74
77
class TestCommit(TestCaseWithTransport):
75
78
 
525
528
            ('change', 'added', 'newdir'),
526
529
            ('change', 'added', 'newfile'),
527
530
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
 
531
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
528
532
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
529
533
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
530
 
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
531
534
            ('deleted', 'dirtoremove'),
532
535
            ('deleted', 'filetoremove'),
533
536
            ],
696
699
        self.assertEqual('Selected-file commit of merges is not supported'
697
700
                         ' yet: files bar, baz', str(err))
698
701
 
 
702
    def test_commit_ordering(self):
 
703
        """Test of corner-case commit ordering error"""
 
704
        tree = self.make_branch_and_tree('.')
 
705
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
706
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
 
707
        tree.commit('setup')
 
708
        self.build_tree(['a/c/d/'])
 
709
        tree.add('a/c/d')
 
710
        tree.rename_one('a/z/x', 'a/c/d/x')
 
711
        tree.commit('test', specific_files=['a/z/y'])
 
712
 
699
713
    def test_commit_no_author(self):
700
714
        """The default kwarg author in MutableTree.commit should not add
701
715
        the 'author' revision property.