D340: rebase: prefer choosing merge base with successor in destination

[martinvonz (Martin von Zweigbergk)]

martinvonz added a comment.


  In https://phab.mercurial-scm.org/D340#6330, @quark wrote:
  
  > Since the "unwanted" warning "covers" the case this patch handles. The behavior is still "correct" (since the warning is printed) without this patch. I'm leaning towards dropping this patch.
  >
  > For errors vs warnings, I still think it's better to give power users a chance to proceed. How do you think about this approach?
  >
  > - If there are multiple merge base candidates, calculate "unwanted" revsets for both, and if only one of them is empty, pick that one automatically and proceed.
  > - If both merge base candidates have "unwanted" revsets, raise `error.InterventionRequired` so power users could still have a chance to proceed fixing them manually.
  
  
  Sounds good to me. Thanks!
  
  The test cases still seem useful, so maybe you can keep that part of the patch?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D340

To: quark, #hg-reviewers
Cc: martinvonz, mercurial-devel