Mercurial > hg
comparison mercurial/discovery.py @ 11573:7ecf4a082c5f
discovery: clarify comment
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 15 Jul 2010 14:40:17 +0200 |
parents | d420ff348c49 |
children | 6381fa7bfa53 |
comparison
equal
deleted
inserted
replaced
11572:324bad1dc230 | 11573:7ecf4a082c5f |
---|---|
33 | 33 |
34 If base dict is specified, assume that these nodes and their parents | 34 If base dict is specified, assume that these nodes and their parents |
35 exist on the remote side and that no child of a node of base exists | 35 exist on the remote side and that no child of a node of base exists |
36 in both remote and repo. | 36 in both remote and repo. |
37 Furthermore base will be updated to include the nodes that exists | 37 Furthermore base will be updated to include the nodes that exists |
38 in repo and remote but no children exists in repo and remote. | 38 in repo and remote but no children exists in both repo and remote. |
39 In other words, base is the set of heads of the DAG resulting from | |
40 the intersection of the nodes from repo and remote. | |
39 If a list of heads is specified, return only nodes which are heads | 41 If a list of heads is specified, return only nodes which are heads |
40 or ancestors of these heads. | 42 or ancestors of these heads. |
41 | 43 |
42 All the ancestors of base are in repo and in remote. | 44 All the ancestors of base are in repo and in remote. |
43 """ | 45 """ |