Mercurial > hg

changeset 31608:4baf79a77afa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Mar 2017 08:37:26 -0700
parents aea8ec3f7dd1 (current diff) ed5b25874d99 (diff)
children 8e516f71577a
files mercurial/changegroup.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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