view templates/index.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 d1943df604c4
children 248e54a9456e
line wrap: on
line source

#header#
<title>Mercurial repositories index</title>
</head>
<body>

<h2>Mercurial Repositories</h2>

<table>
    <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 change</a></td>
        <td>&nbsp;</td>
    <tr>
    #entries%indexentry#
</table>

#footer#