At http://people.ubuntu.com/~robertc/baz2.0/commit-iterchanges
------------------------------------------------------------
revno: 3796
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Robert Collins <[EMAIL PROTECTED]>
branch nick: commit-iterchanges
timestamp: Tue 2008-12-02 14:01:20 +1100
message:
CommitBuilder.record_iter_changes handles merged symlinks.
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:59:35 +0000
+++ b/bzrlib/tests/per_repository/test_commit_builder.py 2008-12-02
03:01:20 +0000
@@ -891,6 +891,14 @@
os.symlink('target', 't1/link')
self._commit_sprout_rename_merge(tree1, 'link')
+ def test_last_modified_revision_after_merge_link_changes_ric(self):
+ # merge a link changes the last modified.
+ self.requireFeature(tests.SymlinkFeature)
+ tree1 = self.make_branch_and_tree('t1')
+ os.symlink('target', 't1/link')
+ self._commit_sprout_rename_merge(tree1, 'link',
+ mini_commit=self.mini_commit_record_iter_changes)
+
def _commit_sprout_rename_merge_converged(self, tree1, name):
rev1, tree2 = self._commit_sprout(tree1, name)
# change on the other side to merge back
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
