Rev 1659: Fix syntax error for svn 1.4 users. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1659
revision-id: jelmer at samba.org-20080826014926-hmkqx28syvc0hpsp
parent: jelmer at samba.org-20080826014441-3fxukz7wlyty7p29
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-08-26 03:49:26 +0200
message:
  Fix syntax error for svn 1.4 users.
modified:
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-08-26 01:44:41 +0000
+++ b/mapping3/__init__.py	2008-08-26 01:49:26 +0000
@@ -342,9 +342,10 @@
             self.revprop_map.export_text_parents(can_use_custom_revprops, text_parents, svn_revprops, fileprops)
 
     def export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops):
-        (_, fileprops) = mapping.BzrSvnMappingFileProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops)
+        (svn_revprops, fileprops) = mapping.BzrSvnMappingFileProps.export_revision(self, can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, revision_id, revno, merges, old_fileprops)
         if can_use_custom_revprops:
-            (svn_revprops, _) = self.revprop_map.export_revision(can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, None, revno, merges, old_fileprops)
+            (extra_svn_revprops, _) = self.revprop_map.export_revision(can_use_custom_revprops, branch_root, timestamp, timezone, committer, revprops, None, revno, merges, old_fileprops)
+            svn_revprops.update(extra_svn_revprops)
         return (svn_revprops, fileprops)
 
     def export_fileid_map(self, can_use_custom_revprops, fileids, revprops, fileprops):