Mercurial > hg > evolve
changeset 3226:180494f588e2 mercurial-3.8
test-compat: merge future 6.7.0 in mercurial-3.8 branch
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 22:56:52 +0200 |
| parents | 27305068c5c9 (current diff) add76a5eb1ae (diff) |
| children | cc3115ddcdba |
| files | tests/test-obsolete.t |
| diffstat | 2 files changed, 6 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG +++ b/CHANGELOG @@ -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 +++ b/hgext3rd/evolve/obshistory.py @@ -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,