Mercurial > evolve
changeset 3117:3e2abd40da07 mercurial-4.2
test-compat: merge future 6.7.0 in mercurial-4.2 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 22:54:08 +0200 |
| parents | 9c9c8c1eeb93 (current diff) 9f900937c198 (diff) |
| children | a1cdc128defd ef04514bca47 |
| files | tests/test-drop.t tests/test-evolve-effectflags.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-obsolete.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-topic-tutorial.t |
| diffstat | 2 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Fri Oct 20 18:34:22 2017 +0200 +++ b/CHANGELOG Fri Oct 20 22:54:08 2017 +0200 @@ -4,17 +4,15 @@ 6.8.0 -- in progress ---------------- + * compatibility with Mercurial 4.4 + (use upstream implementation for obsfate and effect-flags starting hg 4.4+) + * pager: pager support to `obslog` and `evolve --list` + topic(0.4.0) * topic: fix handling of bookmarks and phases while changing topics. - -6.7.2 -- in progress ----------------- - - * pager: pager support to `obslog` and `evolve --list` - -topic(0.3.2) - + (mercurial 4.2 and above only) + * topic: fix 'topic-mode' behavior when amending * pager: pager support to `topics` and `stack` 6.7.1 -- 2017-10-10
--- a/hgext3rd/evolve/obshistory.py Fri Oct 20 18:34:22 2017 +0200 +++ b/hgext3rd/evolve/obshistory.py Fri Oct 20 22:54:08 2017 +0200 @@ -815,13 +815,6 @@ # Replace the old one obsutil.successorsetverb = old -# XXX temporary disable operation to clarify tests changes -if util.safehasattr(obsutil, 'markersoperations'): - - @eh.wrapfunction(obsutil, 'markersoperations') - def markersoperations(orig, *args, **kwargs): - return [] - FORMATSSETSFUNCTIONS = [ _successorsetdates, _successorsetusers,