← 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: Aaron Bentley
  • Date: 2007-07-13 06:10:29 UTC
  • mfrom: (2616 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2617.
  • Revision ID: aaron.bentley@utoronto.ca-20070713061029-9ebz58a3yvvax5du
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit.py
525
525
            ('change', 'added', 'newdir'),
526
526
            ('change', 'added', 'newfile'),
527
527
            ('renamed', 'renamed', 'dirtorename', 'renameddir'),
528
 
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
529
528
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
530
529
            ('renamed', 'renamed', 'filetoreparent', 'renameddir/reparentedfile'),
 
530
            ('renamed', 'renamed', 'filetorename', 'renamedfile'),
531
531
            ('deleted', 'dirtoremove'),
532
532
            ('deleted', 'filetoremove'),
533
533
            ],
695
695
        self.assertEqual(['bar', 'baz'], err.files)
696
696
        self.assertEqual('Selected-file commit of merges is not supported'
697
697
                         ' yet: files bar, baz', str(err))
698
 
 
699
 
    def test_commit_ordering(self):
700
 
        """Test of corner-case commit ordering error"""
701
 
        tree = self.make_branch_and_tree('.')
702
 
        self.build_tree(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
703
 
        tree.add(['a/', 'a/z/', 'a/c/', 'a/z/x', 'a/z/y'])
704
 
        tree.commit('setup')
705
 
        self.build_tree(['a/c/d/'])
706
 
        tree.add('a/c/d')
707
 
        tree.rename_one('a/z/x', 'a/c/d/x')
708
 
        tree.commit('test', specific_files=['a/z/y'])