Mercurial > hg
view .hgignore @ 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 | 5d0b94d3ad0c |
children | 4a064e1977f8 |
line wrap: on
line source
syntax: glob *.elc *.orig *.rej *~ *.mergebackup *.o *.so *.pyc *.swp *.prof tests/.coverage* tests/annotated tests/*.err build contrib/hgsh/hgsh dist doc/*.[0-9] doc/*.[0-9].gendoc.txt doc/*.[0-9].{x,ht}ml MANIFEST patches mercurial/__version__.py Output/Mercurial-*.exe .DS_Store tags cscope.* syntax: regexp ^\.pc/