# HG changeset patch # User Benoit Boissinot # Date 2010-07-15 12:40:17 # Node ID 7ecf4a082c5fadb048e3df3a80dedc118509bc72 # Parent 324bad1dc2305dd476e286f4817efa8c050fafd7 discovery: clarify comment diff --git a/mercurial/discovery.py b/mercurial/discovery.py --- a/mercurial/discovery.py +++ b/mercurial/discovery.py @@ -35,7 +35,9 @@ def findcommonincoming(repo, remote, bas exist on the remote side and that no child of a node of base exists in both remote and repo. Furthermore base will be updated to include the nodes that exists - in repo and remote but no children exists in repo and remote. + in repo and remote but no children exists in both repo and remote. + In other words, base is the set of heads of the DAG resulting from + the intersection of the nodes from repo and remote. If a list of heads is specified, return only nodes which are heads or ancestors of these heads.