# HG changeset patch # User Pierre-Yves David # Date 1516070124 -3600 # Node ID bf6b859807bac23752a26e58876fe3a4a9a2fef8 # Parent fb18c54b4d49abc7dc7323ba02c95f7840396e18# Parent 740e1267be6f475352a6d364b23b4ec35266dab6 branching: merge further compat change into stable diff -r fb18c54b4d49 -r bf6b859807ba hgext3rd/evolve/obscache.py --- a/hgext3rd/evolve/obscache.py Tue Jan 16 02:23:35 2018 +0100 +++ b/hgext3rd/evolve/obscache.py Tue Jan 16 03:35:24 2018 +0100 @@ -98,7 +98,7 @@ return obsstore -if obsolete._fm0readmarkers.__code__.co_argcount > 1: +if obsolete._fm0readmarkers.__code__.co_argcount > 2: # hg-4.3+ has the "offset" parameter, and _fm?readmarkers also have an # extra "stop" parameter # Note that _readmarkers is wrapped by @util.nogc, so its co_argcount is