branching: merge further fix into stable stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 23 Apr 2018 12:03:05 +0100
branchstable
changeset 3706 47e6776c2ef0
parent 3704 a0c39e8d2c29 (current diff)
parent 3705 bd236590d127 (diff)
child 3707 95ee7bf46ade
branching: merge further fix into stable
--- 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