Painful user experience with 'hg resolve'

[Antoine Pitrou]

On Thu, 25 Aug 2011 16:33:39 -0400
Greg Ward <greg at gerg.ca> wrote:
> 
> "Now I fix my conflicts and make sure the code builds"
> 
>   $ vim Foo.java
>   $ make
> 
> "Great! Now I'll check what other files have conflicts"
> 
>   $ hg resolve --all    (**)
>   [...messages about Foo.java being merged again and failing again...]
> 
> "Good, it worked! Ready to commit!"
> 
>   $ hg resolve -m Foo.java
>   $ hg commit ...

I also got bitten by this.
http://mercurial.selenic.com/bts/issue2463

Now I have memorized "hg res -l" and "hg res -am" as the two useful
incantations of "hg resolve", but it would have been nice if the
learning curve had been less painful.

Regards

Antoine.