# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1490369846 25200
# Node ID 4baf79a77afa3f4734e0c51e501c7737a36757eb
# Parent  aea8ec3f7dd1967a05ecce8f779e16f7ad14fdee# Parent  ed5b25874d998ababb181a939dd37a16ea644435
merge with stable

diff -r aea8ec3f7dd1 -r 4baf79a77afa mercurial/changegroup.py
--- a/mercurial/changegroup.py	Sun Mar 19 01:47:56 2017 -0400
+++ b/mercurial/changegroup.py	Fri Mar 24 08:37:26 2017 -0700
@@ -294,7 +294,7 @@
                 # will not see an inconsistent view
                 cl = repo.changelog
                 cl.delayupdate(tr)
-                oldheads = cl.heads()
+                oldheads = set(cl.heads())
 
                 trp = weakref.proxy(tr)
                 # pull off the changeset group