~jamesh/loggerhead/devel

« back to all changes in this revision

Viewing changes to loggerhead/templates/revision.kid

  • Committer: James Henstridge
  • Date: 2007-01-25 02:43:08 UTC
  • mfrom: (97.1.13 loggerhead)
  • Revision ID: james@jamesh.id.au-20070125024308-w3gyvoo5830hcvr2
merge from robey's branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
83
83
            <th class="children"> merged in: </th>
84
84
            <td class="children">
85
85
                <span py:for="child in change.merge_points">
86
 
                    ${revision_link(child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')',
87
 
                        clear=1, start_revid=child.revid)} <br /> 
 
86
                    ${revision_link(child.revid, '(' + child.revno + util.if_present(' %s', child.branch_nick) + ')', clear=1, start_revid=child.revid)} <br /> 
88
87
                </span>
89
88
            </td>
90
89
        </tr>
92
91
                <th class="parents"> merged from: </th>
93
92
                <td class="parents">
94
93
                    <span py:for="parent in change.parents"><span py:if="parent.revid != change.parents[0].revid">
95
 
                        ${revision_link(parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')',
96
 
                            clear=1, start_revid=parent.revid)} <br />
 
94
                        ${revision_link(parent.revid, '(' + parent.revno + util.if_present(' %s', parent.branch_nick) + ')', clear=1, start_revid=parent.revid)} <br />
97
95
                    </span></span>
98
96
                </td>
99
97
        </tr>