Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/exchange.py
changeset 33036 52c7060b707a
parent 33030 3e102a8dd52c
child 33037 d765ad56081f 
--- a/mercurial/exchange.py	Wed Jun 21 14:42:04 2017 -0700
+++ b/mercurial/exchange.py	Thu Jun 22 13:58:20 2017 -0700
@@ -1398,7 +1398,7 @@
 
     if pullop.fetch:
         results = [cg['return'] for cg in op.records['changegroup']]
-        pullop.cgresult = changegroup.combineresults(results)
+        pullop.cgresult = bundle2.combinechangegroupresults(results)
 
     # processing phases change
     for namespace, value in op.records['listkeys']:
Mercurial