1 files changed, 79 insertions, 0 deletions
diff --git a/bzrlib/tests/per_repository_vf/test_merge_directive.py b/bzrlib/tests/per_repository_vf/test_merge_directive.py
new file mode 100644
index 0000000..9f12d5e
--- /dev/null
+++ b/bzrlib/tests/per_repository_vf/test_merge_directive.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2009 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""Tests for how merge directives interact with various repository formats.
+
+Bundles contain the serialized form, so changes in serialization based on
+repository effects the final bundle.
+"""
+
+from bzrlib import (
+    chk_map,
+    merge_directive,
+    )
+
+from bzrlib.tests.scenarios import load_tests_apply_scenarios
+from bzrlib.tests.per_repository_vf import (
+    TestCaseWithRepository,
+    all_repository_vf_format_scenarios,
+    )
+
+load_tests = load_tests_apply_scenarios
+
+
+class TestMergeDirective(TestCaseWithRepository):
+
+    scenarios = all_repository_vf_format_scenarios()
+
+    def make_two_branches(self):
+        builder = self.make_branch_builder('source')
+        builder.start_series()
+        builder.build_snapshot('A', None, [
+            ('add', ('', 'root-id', 'directory', None)),
+            ('add', ('f', 'f-id', 'file', 'initial content\n')),
+            ])
+        builder.build_snapshot('B', 'A', [
+            ('modify', ('f-id', 'new content\n')),
+            ])
+        builder.finish_series()
+        b1 = builder.get_branch()
+        b2 = b1.bzrdir.sprout('target', revision_id='A').open_branch()
+        return b1, b2
+
+    def create_merge_directive(self, source_branch, submit_url):
+        return merge_directive.MergeDirective2.from_objects(
+            source_branch.repository,
+            source_branch.last_revision(),
+            time=1247775710, timezone=0,
+            target_branch=submit_url)
+
+    def test_create_merge_directive(self):
+        source_branch, target_branch = self.make_two_branches()
+        directive = self.create_merge_directive(source_branch,
+                                                target_branch.base)
+        self.assertIsInstance(directive, merge_directive.MergeDirective2)
+
+
+    def test_create_and_install_directive(self):
+        source_branch, target_branch = self.make_two_branches()
+        directive = self.create_merge_directive(source_branch,
+                                                target_branch.base)
+        chk_map.clear_cache()
+        directive.install_revisions(target_branch.repository)
+        rt = target_branch.repository.revision_tree('B')
+        rt.lock_read()
+        self.assertEqualDiff('new content\n', rt.get_file_text('f-id'))
+        rt.unlock()