Mercurial > hg
view templates/footer.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 | 9b817c0a82f1 |
children |
line wrap: on
line source
#motd# <div class="logo"> <a href="http://www.selenic.com/mercurial/"> <img src="#staticurl#hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> </div> </body> </html>