Mercurial > hg
changeset 11573:7ecf4a082c5f
discovery: clarify comment
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Thu, 15 Jul 2010 14:40:17 +0200 |
| parents | 324bad1dc230 |
| children | 6381fa7bfa53 |
| files | mercurial/discovery.py |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/discovery.py Thu Jul 15 14:11:14 2010 +0200 +++ b/mercurial/discovery.py Thu Jul 15 14:40:17 2010 +0200 @@ -35,7 +35,9 @@ 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.