Mercurial > hg

view templates/error.tmpl @ 6268:7e4f66fe964b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2580d418e3f0
children
line wrap: on
line source

#header#
<title>Mercurial Error</title>
</head>
<body>

<h2>Mercurial Error</h2>

<p>
An error occurred while processing your request:
</p>
<p>
#error|escape#
</p>

#footer#