[PATCH 4 of 6] resolve: abort when not applicable

[Pierre-Yves David]

On 05/08/2014 06:46 PM, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc at gmail.com>
> # Date 1397873312 25200
> #      Fri Apr 18 19:08:32 2014 -0700
> # Node ID a5e623de6557ea8854cefc108d5b069adb0f737a
> # Parent  6d5b402aae2d697b93b19ccf8f4d0245c4fc29d3
> resolve: abort when not applicable
>
> The resolve command is only relevant when mergestate is present.
> This patch will make resolve abort when no mergestate is present.
>
> This change will let people know when they are using resolve when they
> shouldn't be. This change will let people know when their use of resolve
> doesn't do anything.
>
> Previously, |hg resolve -m| would allow mergestate to be created. This
> patch now forbids that. Strictly speaking, this is backwards
> incompatible. The author of this patch believes creating mergestate via
> resolve doesn't make much sense and this side-effect was unintended.

This change make sense. I added a (BC) flag in the title to flag the 
backward compatibility breackage. I'm not super fan of the message. but 
I'll let native speaker bikeshed it.

I've queued this series to the clowncopter repo. I expect message fixup 
in follow up patches.

-- 
Pierre-Yves David