# HG changeset patch # User Pierre-Yves David # Date 1524481385 -3600 # Node ID 47e6776c2ef08b5cb4b25684c6b2caac0d7364f9 # Parent a0c39e8d2c2923809f34ad7652e83dbf6bbefa0d# Parent bd236590d1278cb9f5cd3cc043b65371a955703b branching: merge further fix into stable diff -r a0c39e8d2c29 -r 47e6776c2ef0 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Mon Apr 23 11:04:27 2018 +0200 +++ b/hgext3rd/evolve/__init__.py Mon Apr 23 12:03:05 2018 +0100 @@ -721,7 +721,7 @@ ui.warn("(%s)\n" % solvemsg) if util.safehasattr(context, '_filterederror'): # <= hg-4.5 - @eh.wrapfunction(scmutil, '_filterederror') + @eh.wrapfunction(context, '_filterederror') def evolve_filtererror(original, repo, changeid): """build an exception to be raised about a filtered changeid