Show More
@@ -35,7 +35,9 def findcommonincoming(repo, remote, bas | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now