# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555527490 -7200
# Node ID ede9b37572f032c7276a9dfa59785084bb077a78
# Parent  36632d514af265c21c97de5d3ffe19bc5d8f4ea6# Parent  f6099a171a9de9289f026df2e5467aefee08648a
branching: merge stable back into default

diff -r 36632d514af2 -r ede9b37572f0 hgext3rd/evolve/metadata.py
diff -r 36632d514af2 -r ede9b37572f0 hgext3rd/serverminitopic.py
--- a/hgext3rd/serverminitopic.py	Fri Apr 12 02:21:09 2019 +0200
+++ b/hgext3rd/serverminitopic.py	Wed Apr 17 20:58:10 2019 +0200
@@ -159,8 +159,13 @@
 
     def copy(self):
         """return an deep copy of the branchcache object"""
-        new = self.__class__(self, self.tipnode, self.tiprev, self.filteredhash,
-                             self._closednodes)
+        if util.safehasattr(self, '_entries'):
+            _entries = self._entries
+        else:
+            # hg <= 4.9 (624d6683c705, b137a6793c51)
+            _entries = self
+        new = self.__class__(_entries, self.tipnode, self.tiprev,
+                             self.filteredhash, self._closednodes)
         new.phaseshash = self.phaseshash
         return new
 
diff -r 36632d514af2 -r ede9b37572f0 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Fri Apr 12 02:21:09 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Wed Apr 17 20:58:10 2019 +0200
@@ -567,12 +567,18 @@
             self._extra[constants.extrakey] = ''
 
 def wrapadd(orig, cl, manifest, files, desc, transaction, p1, p2, user,
-            date=None, extra=None):
+            date=None, extra=None, p1copies=None, p2copies=None):
     if constants.extrakey in extra and not extra[constants.extrakey]:
         extra = extra.copy()
         del extra[constants.extrakey]
+    # hg <= 4.9 (0e41f40b01cc)
+    kwargs = {}
+    if p1copies is not None:
+        kwargs['p1copies'] = p1copies
+    if p2copies is not None:
+        kwargs['p2copies'] = p2copies
     return orig(cl, manifest, files, desc, transaction, p1, p2, user,
-                date=date, extra=extra)
+                date=date, extra=extra, **kwargs)
 
 # revset predicates are automatically registered at loading via this symbol
 revsetpredicate = topicrevset.revsetpredicate