##// END OF EJS Templates
merge: respect parents order when using `graft` on a merge...
merge: respect parents order when using `graft` on a merge The previous code did not record the index of the replaced parent. It was always using the "graft" destination as `p1`. This could switch parents order in some situation (eg: some of the evolve evolving merge case). Recording and using the information fixes the issue in evolve. We are not aware of core commands calling graft in that fashion, so we could not build a simple test case for it using core commands.

File last commit:

r37042:7c18798f default
r43185:a4ca0610 stable
Show More
changelogentry.tmpl
31 lines | 973 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>
av6
hgweb: show commit phase if it's not public...
r35064 {ifeq(phase, 'public', '', '<tr>
<th class="phase">phase:</th>
<td class="phase">{phase|escape}</td>
</tr>')}
av6
hgweb: show each obsfateentry on its own line...
r36340 {if(obsolete, succsandmarkers%obsfateentry)}
av6
hgweb: explain instabilities of unstable changesets (the rest of the themes)
r37042 {if(instabilities, whyunstable%whyunstableentry)}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 <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>