Mercurial > hg
view mercurial/templates/gitweb/index.tmpl @ 13134:ea3c93b53fdb stable
tag: fix uncommitted merge check and error message (issue2542)
This patch corrects the check for tagging on an uncommitted merge. We
should never commit a new tag changeset on an uncommitted merge, whether
or not --rev is specified. It also changes the error message from:
abort: cannot partially commit a merge (do not specify files or patterns)
to the much more accurate (and terse):
abort: uncommitted merge
Local tags are ok.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Tue, 07 Dec 2010 08:02:54 +0100 |
parents | 56b50194617f |
children | 616ad3f6fd33 |
line wrap: on
line source
{header} <title>Mercurial repositories index</title> </head> <body> <div class="page_header"> <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a> Repositories list </div> <table cellspacing="0"> <tr> <td><a href="?sort={sort_name}">Name</a></td> <td><a href="?sort={sort_description}">Description</a></td> <td><a href="?sort={sort_contact}">Contact</a></td> <td><a href="?sort={sort_lastchange}">Last modified</a></td> <td> </td> <td> </td> </tr> {entries%indexentry} </table> <div class="page_footer"> {motd} </div> </body> </html>