[issue1534] No 'resume' for partially failed Merge

[Marcus Lindblom]

New submission from Marcus Lindblom <macke at yar.nu>:

If a merge fails partway through (say, because a file cannot be written, 
because some other program is hogging it) there is no way to 'resume' it.

Rather, I have to do 'hg merge -f' and then choose my own version for 
each file that preceeds the problem file, then hope it works this time. 
(May take a few tries to figure out which program it was.)

If the merge is >20 files, this is rather annoying.

I don't know how to write a repro case for this, as it requires 'locking' a file
for writing.

This is with (Tortoise)Hg 1.1.2 on Vista 32-bit.

----------
messages: 8732
nosy: marcusl
priority: bug
status: unread
title: No 'resume' for partially failed Merge

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1534>
____________________________________________________