Merging when checked out files are modified

[Vadim Lebedev]

I see that if i do hg co...  edit some files  then hg merge ....
the edited files are exactly in the same state as before merge

I think it is problematic because if i fo hg ci at this moment i will 
loose pulled in changes...
I think, the easiest way to resolve this would be to prohibit merge when 
there are uncommitted changes (maybe with a command option  to force the 
merge anyway)


When trying to test this behaviour i've stumbled on the bug in the new 
merge algorithm:

[vadim at inspire hgchild]$ hg merge ~/hgtests/hgparent
retrieving changegroup
merging changesets
Traceback (most recent call last):
  File "/home/vadim/bin/hg", line 278, in ?
    repo.addchangegroup(cg)
  File "/home/vadim/lib/python/mercurial/hg.py", line 691, in addchangegroup
    l = getlen(data, 0)
  File "/home/vadim/lib/python/mercurial/hg.py", line 682, in getlen
    return struct.unpack(">l", data[pos:pos + 4])[0]
TypeError: unsubscriptable object
[vadim at inspire hgchild]$


I'm attaching a shell script demonstrating the bug

Vadim
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hgtest.sh
Type: text/x-sh
Size: 445 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20050512/ba21e928/attachment-0001.sh>