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

2017-08-15 Thread 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. > >

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

2017-08-15 Thread quark (Jun Wu)
quark planned changes to this revision. quark added a comment. 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 th

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

2017-08-15 Thread martinvonz (Martin von Zweigbergk)
martinvonz added inline comments. INLINE COMMENTS > rebase.py:1115 > +#/| | # because it re-introduces obsoleted content. If we choose > +# A B D # A as merge base, it works as expected - C' may be empty. > +if all(b != nullrev for b in bases): And if there are more ances

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

2017-08-14 Thread quark (Jun Wu)
quark updated this revision to Diff 870. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=868&id=870 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/t

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

2017-08-14 Thread quark (Jun Wu)
quark updated this revision to Diff 868. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=830&id=868 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/t

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

2017-08-12 Thread quark (Jun Wu)
quark updated this revision to Diff 830. quark edited the summary of this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=770&id=830 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase

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

2017-08-10 Thread quark (Jun Wu)
quark updated this revision to Diff 770. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=768&id=770 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/t

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

2017-08-10 Thread quark (Jun Wu)
quark updated this revision to Diff 768. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D340?vs=766&id=768 REVISION DETAIL https://phab.mercurial-scm.org/D340 AFFECTED FILES hgext/rebase.py tests/test-rebase-obsolete.t CHANGE DETAILS diff --git a/t

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

2017-08-10 Thread quark (Jun Wu)
quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY As demonstrated by the test case change, and the new comment. Choosing a merge base candidate with a successor in destination would allow us to avoid re-introducin