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.
#header#
# HG changeset patch
# User #author#
# Date #date|hgdate#
# Node ID #node#
#parent%changesetparent#
#desc#
#diff#