##// END OF EJS Templates
log: include unmodified-in-merge files in log diff/stat (issue2383)...
log: include unmodified-in-merge files in log diff/stat (issue2383) f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched filenames, but actually it only contains the names of files changed in the relevant changeset. That meant that log diff/stat of merges missed the diff for files only changed in the other branch. This is a minimal fix for making sure we only use fns when we are following and thus will have problems with merges anyway ...

File last commit:

r10254:8d5de524 default
r12382:28ddf671 stable
Show More
changelog.tmpl
39 lines | 1.2 KiB | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
<title>{repo|escape}: Changelog</title>
<link rel="alternate" type="application/atom+xml"
href="{url}atom-log" title="Atom feed for {repo|escape}"/>
<link rel="alternate" type="application/rss+xml"
href="{url}rss-log" title="RSS feed for {repo|escape}"/>
</head>
<body>
<div class="page_header">
<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
</div>
<form action="{url}log">
{sessionvars%hiddenformentry}
<div class="search">
<input type="text" name="rev" />
</div>
</form>
<div class="page_nav">
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url}shortlog/{rev}{sessionvars%urlparameter}">shortlog</a> |
changelog |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
<br/>
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 {changenav%nav}<br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
{entries%changelogentry}
<div class="page_nav">
Nicolas Dumazet
hgweb: changenav: separate pages before and after the current position...
r10254 {changenav%nav}<br/>
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 </div>
{footer}