view templates/gitweb/filerevision.tmpl @ 5483:0c43f87baba3 default tip

Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents 46c5e1ee8aaa
children
line wrap: on
line source

#header#
<title>{repo|escape}: {file|escape}@{node|short}</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://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / file revision
</div>

<div class="page_nav">
<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url}file/#node|short##path|urlescape#{sessionvars%urlparameter}">manifest</a> |
<a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> |
file |
<a href="{url}log/{node|short}/#file|urlescape#{sessionvars%urlparameter}">revisions</a> |
<a href="{url}annotate/{node|short}/#file|urlescape#{sessionvars%urlparameter}">annotate</a> |
<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
<a href="{url}raw-file/{node|short}/#file|urlescape#">raw</a><br/>
</div>

<div class="title">#file|escape#</div>

<div class="title_text">
<table cellspacing="0">
<tr>
 <td>author</td>
 <td>#author|obfuscate#</td></tr>
<tr>
 <td></td>
 <td>#date|date# (#date|age# ago)</td></tr>
<tr>
 <td>changeset {rev}</td>
 <td style="font-family:monospace"><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}">#node|short#</a></td></tr>
#parent%filerevparent#
#child%filerevchild#
<tr>
 <td>permissions</td>
 <td style="font-family:monospace">#permissions|permissions#</td></tr>
</table>
</div>

<div class="page_path">
{desc|strip|escape|addbreaks}
</div>

<div class="page_body">
#text%fileline#
</div>

#footer#