Rev 1437: Add test for mergeinfo. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1437
revision-id: jelmer at samba.org-20080704021908-ib1032yf15fyoxzz
parent: jelmer at samba.org-20080704021816-a6nkpwvaideoa7fa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-07-04 04:19:08 +0200
message:
  Add test for mergeinfo.
modified:
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2008-07-03 23:47:48 +0000
+++ b/tests/test_commit.py	2008-07-04 02:19:08 +0000
@@ -28,6 +28,7 @@
 from copy import copy
 import os
 
+from bzrlib.plugins.svn import ra
 from bzrlib.plugins.svn.commit import set_svn_revprops, _revision_id_to_svk_feature
 from bzrlib.plugins.svn.errors import RevpropChangeFailed
 from bzrlib.plugins.svn.properties import time_to_cstring
@@ -200,7 +201,7 @@
             self.client_get_prop("dc", 
                 "bzr:revision-id:v3-none", 2))
 
-    def test_commit_sets_merge_info(self):
+    def test_commit_sets_mergeinfo(self):
         repos_url = self.make_repository('d')
 
         dc = self.get_commit_editor(repos_url)
@@ -238,6 +239,13 @@
             self.client_get_prop("%s/trunk" % repos_url, 
                 "svn:mergeinfo", 4))
 
+        try:
+            c = ra.RemoteAccess(repos_url)
+            mi = c.mergeinfo(["trunk"], 4)
+            self.assertEquals({"trunk": {"/tags/foo": [(1, 3, 1)]}}, mi)
+        except NotImplementedError:
+            pass # Svn 1.4
+
     def test_commit_metadata(self):
         repos_url = self.make_client('d', 'dc')
         wt = self.open_checkout("dc")