##// END OF EJS Templates
mergestate: handle additional record types specially...
mergestate: handle additional record types specially This works around a bug in older Mercurial versions' handling of the v2 merge state. We also add a bunch of tests that make sure that (1) we correctly abort when the merge state has an unsupported record type (2) aborting the merge, rebase or histedit continues to work and clears out the merge state.

File last commit:

r21124:a6571421 default
r27027:a01ecbcf default
Show More
changelogentry.tmpl
25 lines | 760 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <table class="logEntry parity{parity}">
<tr>
FUJIWARA Katsunori
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...
r21124 <th class="label"><span class="age">{date|rfc822date}</span>:</th>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <th class="firstline">{desc|strip|firstline|escape|nonempty}</th>
</tr>
<tr>
<th class="revision">changeset {rev}:</th>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <td class="node"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
{parent%changelogparent}
{child%changelogchild}
{changelogtag}
<tr>
<th class="author">author:</th>
<td class="author">{author|obfuscate}</td>
</tr>
<tr>
<th class="date">date:</th>
Brodie Rao
hgweb: fix dynamic date calculation not working under Safari...
r15375 <td class="date">{date|rfc822date}</td>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </tr>
<tr>
Thomas Arendsen Hein
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...
r18526 <th class="files"><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>:</th>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <td class="files">{files}</td>
</tr>
</table>