--- a/mercurial/discovery.py Wed Jan 25 14:06:04 2012 -0600
+++ b/mercurial/discovery.py Tue Jan 24 19:49:30 2012 +0100
@@ -131,7 +131,7 @@
return og
-def checkheads(repo, remote, outgoing, remoteheads, newbranch=False):
+def checkheads(repo, remote, outgoing, remoteheads, newbranch=False, inc=False):
"""Check that a push won't add any outgoing head
raise Abort error and display ui message as needed.
@@ -190,9 +190,9 @@
# Construct {old,new}map with branch = None (topological branch).
# (code based on _updatebranchcache)
oldheads = set(h for h in remoteheads if h in cl.nodemap)
- newheads = oldheads.union(outg)
+ newheads = oldheads.union(outgoing.missing)
if len(newheads) > 1:
- for latest in reversed(outg):
+ for latest in reversed(outgoing.missing):
if latest not in newheads:
continue
minhrev = min(cl.rev(h) for h in newheads)