view templates/gitweb/shortlog.tmpl @ 6268:7e4f66fe964b

merge: notice uncommited copies (issue1000) As mentioned in msg5349 in issue988, "hg update" doesn't take into account uncommitted copies. To reproduce: ---------------- hg init repo cd repo touch foo hg ci -Am 'add foo' echo >> foo hg ci -m 'change foo' hg up -C 0 hg mv foo bar HGMERGE=false thg --debug -y update -------------------------- A similar problem happens with hg merge --force. I'm attaching a possible patch.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 11:01:31 -0500
parents 673d8a6bc709
children 7f58dec6aeb7
line wrap: on
line source

#header#
<title>#repo|escape#: Shortlog</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" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / shortlog
</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> |
shortlog |
<a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>#archives%archiveentry#
<br/>
#changenav%navshortentry#<br/>
</div>

<div class="title">&nbsp;</div>
<table cellspacing="0">
#entries%shortlogentry#
</table>

<div class="page_nav">
#changenav%navshortentry#
</div>

#footer#