svn:mergeinfo has value "False"

[Ryan J Ollos]

​th:changeset/14806 shows:

Property svn:mergeinfo set to False

The following is shown from the command line client:

$svn proplist -r 14806 -v
Properties on 'https://trac-hacks.org/svn/defaultccplugin/trunk':
  svn:ignore
    *.egg-info
    
  svn:mergeinfo
    /defaultccplugin/branches/0.3:14805

[Jun Omae]

The issue occurs when svn:mergeinfo property in the revision is created. Trac 1.0.x has the issue but Trac 0.12.x doesn't have.

tracopt/versioncontrol/svn/svn_prop.py

@@ -273 +273 @@
         if not rows:
             return None
         rows.sort()
-        has_deleted = rows[-1][0] if rows else None
-        return tag(has_deleted and tag.a(_('(toggle deleted branches)'),
-                                         class_='trac-toggledeleted',
-                                         href='#'),
+        if rows and rows[-1][0]:
+            toggledeleted = tag.a(_("(toggle deleted branches)"),
+                                  class_='trac-toggledeleted', href='#')
+        else:
+            toggledeleted = None
+        return tag(toggledeleted,
                    tag.table(tag.tbody(
                        [tag.tr(row, class_='trac-deleted' if deleted else None)
                         for deleted, spath, row in rows]), class_='props'))

tracopt/versioncontrol/svn/tests/svn_fs.py

@@ -860 +860 @@
         self.assertIn('>eligible</a>', node)
 
         self.assertNotIn('(toggle deleted branches)', unicode(result))
+        self.assertNotIn('False<', unicode(result))
 
     def test_merge_prop_renderer_with_deleted_branches(self):
         context = _create_context()

[Jun Omae]

Committed in [14236] and merged to trunk in [14237].