[issue1000] merge.py ignores uncommitted copies

Alexis S. L. Carvalho mercurial-bugs at selenic.com
Fri Feb 22 11:40:22 CST 2008

New submission from Alexis S. L. Carvalho <alexis at cecm.usp.br>:

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.

files: working-dir-copies.patch
messages: 5354
nosy: alexis, jcoomes, mpm
priority: bug
status: unread
title: merge.py ignores uncommitted copies
topic: merge, patch

Mercurial issue tracker <mercurial-bugs at selenic.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: working-dir-copies.patch
Type: text/x-patch
Size: 488 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20080222/5de793c9/attachment.bin 

More information about the Mercurial-devel mailing list