[PATCH 2 of 4 V6 STABLE] revert: be more helpful on uncommitted merges

[Kevin Bullock]

On Jun 21, 2011, at 3:17 AM, Adrian Buehlmann wrote:

>     (use --all to discard all changes or 'hg update -C .' to discard the pending merge)
> 
> (To be honest, I still find the --all hint pretty pointless if there is a pending
> merge, but Matt is a fan of it. So let's keep that can of worms closed.)


It reflects a commonly-recommended usage of revert:

$ hg merge other-head
$ hg revert -a
$ hg ci -m 'dummy merge'

so I'd prefer to have both hints in there. 'pending' instead of 'uncommitted' might squeeze my proposal into 80 characters if that's desired.

pacem in terris / mir / shanti / salaam / heiwa
Kevin R. Bullock