[PATCH] revert: simplify help message, better error message on reverting a merge

[Pierre-Yves David]

On Wed, Jun 08, 2011 at 10:16:19AM -0500, Kevin Bullock wrote:
> On Jun 8, 2011, at 3:08 AM, Pierre-Yves David wrote:
> 
> > On Tue, Jun 07, 2011 at 03:52:21PM -0500, Matt Mackall wrote:
> > 
> >> This one is rather notable in that it no longer considers trying to
> >> revert in a merge to be ambiguous, it just uses the first parent:
> >> 
> >> http://www.selenic.com/hg/rev/afe0d4c24866
> > 
> > Considering that rebase switch parent it might be useful to specify which
> > parent was used for the revert.
> 
> I'm confused. How does rebase enter into this?

Rebase do merge. For rebase, local is "what you rebase on" other is "what your
are currently rebasing". This confuse several people.

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110608/2d6e31b1/attachment.pgp>