# HG changeset patch # User Matt Mackall # Date 1120717283 28800 # Node ID 31e090c34d3b7dbe0e92597d2fd2430d2ccb7329 # Parent ac0ec421e3a59d7b9457744ff3dbc1bc1910ece9 Fix up the broken bits in findoutgoing diff -r ac0ec421e3a5 -r 31e090c34d3b mercurial/hg.py --- a/mercurial/hg.py Wed Jul 06 22:20:56 2005 -0800 +++ b/mercurial/hg.py Wed Jul 06 22:21:23 2005 -0800 @@ -977,17 +977,18 @@ def findoutgoing(self, remote): base = {} - findincoming(self, remote, base) + self.findincoming(remote, base) remain = dict.fromkeys(self.changelog.nodemap) # prune everything remote has from the tree + del remain[nullid] remove = base.keys() while remove: n = remove.pop(0) if n in remain: del remain[n] for p in self.changelog.parents(n): - remain.append(p) + remove.append(p) # find every node whose parents have been pruned subset = []