Edgewall Software
Modify

Opened 5 years ago

Closed 5 years ago

#12125 closed defect (fixed)

svn:mergeinfo has value "False"

Reported by: Ryan J Ollos Owned by: Jun Omae
Priority: normal Milestone: 1.0.9
Component: version control/changeset view Version: 1.0
Severity: normal Keywords: svn:mergeinfo
Cc: Branch:
Release Notes:

Fix False wrongly being shown in svn:mergeinfo property when the property is created.

API Changes:
Internal Changes:

Description (last modified by 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

Attachments (0)

Change History (5)

comment:1 by Ryan J Ollos, 5 years ago

Description: modified (diff)

comment:2 by Jun Omae, 5 years ago

Keywords: svn:mergeinfo added
Milestone: 1.0.8

comment:3 by Ryan J Ollos, 5 years ago

Milestone: 1.0.81.0.9

comment:4 by Jun Omae, 5 years ago

Owner: set to Jun Omae
Status: newassigned
Version: 1.0

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

    diff --git a/tracopt/versioncontrol/svn/svn_prop.py b/tracopt/versioncontrol/svn/svn_prop.py
    index 1903b08d5..eb7d1e037 100644
    a b class SubversionMergePropertyRenderer(Component):  
    273273        if not rows:
    274274            return None
    275275        rows.sort()
    276         has_deleted = rows[-1][0] if rows else None
    277         return tag(has_deleted and tag.a(_('(toggle deleted branches)'),
    278                                          class_='trac-toggledeleted',
    279                                          href='#'),
     276        if rows and rows[-1][0]:
     277            toggledeleted = tag.a(_("(toggle deleted branches)"),
     278                                  class_='trac-toggledeleted', href='#')
     279        else:
     280            toggledeleted = None
     281        return tag(toggledeleted,
    280282                   tag.table(tag.tbody(
    281283                       [tag.tr(row, class_='trac-deleted' if deleted else None)
    282284                        for deleted, spath, row in rows]), class_='props'))
  • tracopt/versioncontrol/svn/tests/svn_fs.py

    diff --git a/tracopt/versioncontrol/svn/tests/svn_fs.py b/tracopt/versioncontrol/svn/tests/svn_fs.py
    index b437871ec..cc97d2110 100644
    a b En r\xe9sum\xe9 ... \xe7a marche.  
    860860        self.assertIn('>eligible</a>', node)
    861861
    862862        self.assertNotIn('(toggle deleted branches)', unicode(result))
     863        self.assertNotIn('False<', unicode(result))
    863864
    864865    def test_merge_prop_renderer_with_deleted_branches(self):
    865866        context = _create_context()

comment:5 by Jun Omae, 5 years ago

Release Notes: modified (diff)
Resolution: fixed
Status: assignedclosed

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

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain Jun Omae.
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from Jun Omae to the specified user.

Add Comment


E-mail address and name can be saved in the Preferences .
 
Note: See TracTickets for help on using tickets.