##// END OF EJS Templates
rebase: clarify comment about merge ancestor when rebasing merges...
rebase: clarify comment about merge ancestor when rebasing merges The code for picking a merge ancestor when rebasing merges had a long and incorrect comment. The comment would perhaps have been fine as commit message but does not make the code more readable or maintainable and is a bad substitute for correct and readable code. The correct essense of the comment is quite trivial: a merge of an ancestor of the rebase destination and an 'outside' revision can be rebased as if it was a linear change, using 'destination ancestor parent' as base and pretty much ignoring the 'outside' revision. The code path where the comment is placed is however also used for other kinds of merge rebases. The comment is thus not really correct and not helpful. I think it would be better to drop the comment and rewrite the code.

File last commit:

r18526:9409aeaa stable
r23732:c51d6c04 default
Show More
shortlogentry.tmpl
7 lines | 281 B | application/x-cheetah | CheetahLexer
<table class="slogEntry parity{parity}">
<tr>
<td class="age">{date|rfc822date}</td>
<td class="author">{author|person}</td>
<td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td>
</tr>
</table>