##// END OF EJS Templates
copies: distinguish between merged and touched files during upgrade...
copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

File last commit:

r35052:e9a8a941 default
r47571:433cef8f default
Show More
changelogentry.tmpl
16 lines | 489 B | application/x-cheetah | CheetahLexer
<div>
<a class="title" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">
<span class="age">{date|rfc822date}</span>
{desc|strip|firstline|escape|nonempty}
{alltags}
</a>
</div>
<div class="title_text">
<div class="log_link">
<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a><br/>
</div>
<i>{author|obfuscate} [{date|rfc822date}] rev {rev}</i><br/>
</div>
<div class="log_body description">{desc|strip|escape|websub|nonempty}
</div>