/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: Canonical.com Patch Queue Manager
  • Date: 2007-07-05 21:32:50 UTC
  • mfrom: (1551.15.39 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070705213250-ae4p76jrqrmo3dko
(Aaron Bentley) Fix bug #94975 by using iter_entries_by_dir instead of iter_entries to ensure parents come before children

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'),
528
529
            ('renamed', 'renamed', 'dirtoreparent', 'renameddir/reparenteddir'),
529
530
            ('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'])