Rev 1634: Fix some tests. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1634
revision-id: jelmer at samba.org-20080824150124-8cwrjnjwwax3b5qn
parent: jelmer at samba.org-20080824145200-6811k0oue7tvgepn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-24 17:01:24 +0200
message:
  Fix some tests.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-08-24 14:52:00 +0000
+++ b/mapping.py	2008-08-24 15:01:24 +0000
@@ -661,8 +661,9 @@
         super(BzrSvnMappingv4, self).import_revision(svn_revprops, fileprops, uuid, branch, revnum, rev)
 
     def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops):
-        svn_revprops[SVN_REVPROP_BZR_MAPPING_VERSION] = "4"
-        BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
+        (revprops, fileprops) = BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
+        revprops[SVN_REVPROP_BZR_MAPPING_VERSION] = "4"
+        return (revprops, fileprops)
 
     @classmethod
     def parse_revision_id(cls, revid):

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-24 14:52:00 +0000
+++ b/mapping3/__init__.py	2008-08-24 15:01:24 +0000
@@ -360,8 +360,9 @@
 
 class BzrSvnMappingv3RevProps(mapping.BzrSvnMappingRevProps, BzrSvnMappingv3):
     def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops):
-        svn_revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] = "3"
-        BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
+        (revprops, fileprops) = BzrSvnMappingRevProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, fileprops)
+        revprops[mapping.SVN_REVPROP_BZR_MAPPING_VERSION] = "3"
+        return (revprops, fileprops)
 
 
 class BzrSvnMappingv3Hybrid(BzrSvnMappingv3):