Confusing message from "bzr resolve"

[Óscar Fuentes]

Eli Zaretskii <eliz at gnu.org> writes:

> I did a "bzr merge", which announced a text conflict in a single file,
> let's call it FOO.  I edited FOO to resolve the conflict, then typed
>
>   bzr resolve FOO
>
> and was presented with a message
>
>   FOO is not conflicted
>
> Is this message expected?  If it is, it's confusing: it may be
> interpreted as an error message saying, in effect, that I tried to
> resolve a conflict that didn't exist.
>
> Or did I do something wrong while resolving the conflict?

I guess you used Emacs for editing the conflicted file :-)

When you saved the file, VC did a `bzr resolve FOO' on your behalf.

In this case, it is Emacs who introduces the confussion. IMO it should
advertise that it removed the conflict mark for that file.

-- 
Óscar