Mercurial > hg
view templates/filelogentry.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 | ce8f31e0b3b8 |
children |
line wrap: on
line source
<table class="logEntry parity#parity#"> <tr> <th class="age">#date|age# ago:</th> <th class="firstline"><a href="#url#rev/#node|short#{sessionvars%urlparameter}">#desc|strip|firstline|escape#</a></th> </tr> <tr> <th class="revision">revision #filerev#:</td> <td class="node"> <a href="#url#file/#node|short#/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a> <a href="#url#diff/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(diff)</a> <a href="#url#annotate/#node|short#/#file|urlescape#{sessionvars%urlparameter}">(annotate)</a> </td> </tr> #rename%filelogrename# <tr> <th class="author">author:</th> <td class="author">#author|obfuscate#</td> </tr> <tr> <th class="date">date:</th> <td class="date">#date|date#</td> </tr> </table>