[PATCH v2] rebase: add potential divergent commit hashes to error message (issue5086)

[Augie Fackler]

> On Feb 22, 2016, at 8:19 PM, Sean Farley <sean at farley.io> wrote:
> 
>> I know that, but the error output is still useless to me, as it offers no suggestions on how I might avoid the divergence or why it’s bad.
> 
> I definitely think it's an improvement over the current error output:
> "abort: this rebase will cause divergence”.

So, it tells me the changeset I’m about to rebase that would be divergent, but it doesn’t empower me to figure out what it would be divergent against.

Not me feigning ignorance: I don’t know how I’d figure out what the other changeset that would be part of the potential future divergence would be.

> 
>> (Note: **I** know why divergence is bad, but I don’t actually know what I’m doing wrong that would result in divergence. The above sentence is partially me pretending to be a novice user of rebase.)
> 
> For the user that knows about divergence, then they can investigate the
> precursor / other divergent head with the given hash (bikeshedding on
> short hash).

See above - this change adds information which is not helpful, even at my level of familiarity with Mercurial. That’s why I said it’s not an improvement. :/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160222/96447ec1/attachment.sig>