← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-18 03:40:07 UTC
  • mfrom: (2829.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070918034007-n72x452efuovdelm
re-apply Aaron's fix for #94975 (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
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
            ],
699
699
        self.assertEqual('Selected-file commit of merges is not supported'
700
700
                         ' yet: files bar, baz', str(err))
701
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
 
702
713
    def test_commit_no_author(self):
703
714
        """The default kwarg author in MutableTree.commit should not add
704
715
        the 'author' revision property.