# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1516061885 -3600
# Node ID 3a7cf396618232f7cd0ed86d4e83d2ec6ac98d0b
# Parent  0c4967f60eebfe6e657e5ee9c2f072b507e75ef5# Parent  b96568036837d5df2ef8beaf5712ecc9a22b38ee
branching: merge more compatibility fix into stable

diff -r 0c4967f60eeb -r 3a7cf3966182 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Mon Jan 15 21:47:40 2018 +0100
+++ b/hgext3rd/evolve/obshistory.py	Tue Jan 16 01:18:05 2018 +0100
@@ -524,8 +524,7 @@
             firstline = True
             for chunk, label in patch.diffui(repo, node, succ, matchfn,
                                              changes=None, opts=diffopts,
-                                             prefix='', relroot='',
-                                             hunksfilterfn=None):
+                                             prefix='', relroot=''):
                 if firstline:
                     fm.plain('\n')
                     firstline = False
diff -r 0c4967f60eeb -r 3a7cf3966182 tests/test-evolve-topic.t
--- a/tests/test-evolve-topic.t	Mon Jan 15 21:47:40 2018 +0100
+++ b/tests/test-evolve-topic.t	Tue Jan 16 01:18:05 2018 +0100
@@ -248,9 +248,9 @@
   |
   o  0 - {} 199cc73e9a0b add aaa (draft)
   
-  $ hg topic -r 13 bar
+  $ hg topic -r 070c5573d8f9 bar
   changed topic on 1 changes
-  $ hg up 14
+  $ hg up 16d6f664b17c
   switching to topic bar
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved