Rev 3795: CommitBuilder.record_iter_changes handles merged files. in http://people.ubuntu.com/~robertc/baz2.0/commit-iterchanges

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit-iterchanges

------------------------------------------------------------
revno: 3795
revision-id: robertc at robertcollins.net-20081202025935-4tq3gllypb27sm76
parent: robertc at robertcollins.net-20081202024339-47ae2uuhqfdbiw8z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit-iterchanges
timestamp: Tue 2008-12-02 13:59:35 +1100
message:
  CommitBuilder.record_iter_changes handles merged files.
modified:
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
=== modified file 'bzrlib/tests/per_repository/test_commit_builder.py'
--- a/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 02:43:39 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py	2008-12-02 02:59:35 +0000
@@ -877,6 +877,13 @@
         self.build_tree(['t1/file'])
         self._commit_sprout_rename_merge(tree1, 'file', expect_fs_hash=True)
 
+    def test_last_modified_revision_after_merge_file_changes_ric(self):
+        # merge a file changes the last modified.
+        tree1 = self.make_branch_and_tree('t1')
+        self.build_tree(['t1/file'])
+        self._commit_sprout_rename_merge(tree1, 'file', expect_fs_hash=True,
+            mini_commit=self.mini_commit_record_iter_changes)
+
     def test_last_modified_revision_after_merge_link_changes(self):
         # merge a link changes the last modified.
         self.requireFeature(tests.SymlinkFeature)