[issue507] hg merge -f doesn't work after a failed merge

[mathieu clabaut]

New submission from mathieu clabaut <mathieu.clabaut at gmail.com>:

After doing a merge over a dozen of file (quite a hard work as their was lot of
conflicts), one file wasn't merge due to a kdiff3 freezing.

I get the following message after the merge:
There are unresolved merges, you can redo the full merge using:
  hg update -C 1251
  hg merge 1255

As obviously I do not want to redo the work, I tried to force a new merge
against the same cset:

hg merge -f 1255
abort: outstanding uncommitted merges

But I still get the "outstanding uncommitted merges".

Either the [-f] help isn't accurate, either I don't understand anything !

----------
messages: 2805
nosy: mathieu.clabaut
priority: bug
status: unread
title: hg merge -f doesn't work after a failed merge

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