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

[Pierre-Yves David]

On Wed, Jun 08, 2011 at 10:50:24AM -0500, Kevin Bullock wrote:

> But once it's rebased, a changeset has only one parent. How would rebase's merging affect revert?

During rebase you have merge. If this merge conflict you may revert stuff.

> In any case, I don't think it's sensible to include anything about rebase (an extension) in the help for revert (a core command).

It's not about rebase it's about telling the user which parent (of multiparent
working directory) was used for rebase.

-- 
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/e780709b/attachment.pgp>