← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_commit_builder.py

  • Committer: Robert Collins
  • Date: 2008-12-02 02:43:39 UTC
  • mto: This revision was merged to the branch mainline in revision 4183.
  • Revision ID: robertc@robertcollins.net-20081202024339-47ae2uuhqfdbiw8z
CommitBuilder.record_iter_changes handles merged directories.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_commit_builder.py
837
837
        tree.rename_one(name, 'new_' + name)
838
838
        return tree.commit('')
839
839
 
840
 
    def _commit_sprout_rename_merge(self, tree1, name, expect_fs_hash=False):
 
840
    def _commit_sprout_rename_merge(self, tree1, name, expect_fs_hash=False,
 
841
        mini_commit=None):
841
842
        rev1, tree2 = self._commit_sprout(tree1, name)
842
843
        # change both sides equally
843
844
        rev2 = self._rename_in_tree(tree1, name)
844
845
        rev3 = self._rename_in_tree(tree2, name)
845
846
        tree1.merge_from_branch(tree2.branch)
846
 
        rev4 = self.mini_commit(tree1, 'new_' + name, 'new_' + name,
 
847
        if mini_commit is None:
 
848
            mini_commit = self.mini_commit
 
849
        rev4 = mini_commit(tree1, 'new_' + name, 'new_' + name,
847
850
            expect_fs_hash=expect_fs_hash)
848
851
        tree3, = self._get_revtrees(tree1, [rev4])
849
852
        self.assertEqual(rev4, tree3.inventory[name + 'id'].revision)
861
864
        self.build_tree(['t1/dir/'])
862
865
        self._commit_sprout_rename_merge(tree1, 'dir')
863
866
 
 
867
    def test_last_modified_revision_after_merge_dir_changes_ric(self):
 
868
        # merge a dir changes the last modified.
 
869
        tree1 = self.make_branch_and_tree('t1')
 
870
        self.build_tree(['t1/dir/'])
 
871
        self._commit_sprout_rename_merge(tree1, 'dir',
 
872
            mini_commit=self.mini_commit_record_iter_changes)
 
873
 
864
874
    def test_last_modified_revision_after_merge_file_changes(self):
865
875
        # merge a file changes the last modified.
866
876
        tree1 = self.make_branch_and_tree('t1')