Mercurial > hg-stable
view mercurial/templates/spartan/filerevision.tmpl @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
parents | 902148444889 |
children |
line wrap: on
line source
{header} <title>{repo|escape}:{file|escape}</title> </head> <body> <div class="buttons"> <a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> <a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a> <a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">files</a> <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> <a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> <a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a> <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a> </div> <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / {file|escape}</h2> <table> <tr> <td class="metatag">changeset {rev}:</td> <td><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> </tr> {parent%filerevparent} {child%filerevchild} <tr> <td class="metatag">author:</td> <td>{author|obfuscate}</td> </tr> <tr> <td class="metatag">date:</td> <td class="date age">{date|rfc822date}</td> </tr> <tr> <td class="metatag">permissions:</td> <td>{permissions|permissions}</td> </tr> <tr> <td class="metatag">description:</td> <td>{desc|strip|escape|websub|addbreaks|nonempty}</td> </tr> </table> <pre> {text%fileline} </pre> {footer}