diff options
author | Xin Li <delphij@google.com> | 2021-09-26 23:20:32 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2021-09-27 06:36:05 +0000 |
commit | e0b16a22a01c54a00a9e4a0c53dddfce3b0d59d6 (patch) | |
tree | 7759c55cdbe045de3974be17bc3a5557d42619db /docs/manifest-format.md | |
parent | d669d2dee5bd7986593d5df1dd8a736778501bbf (diff) | |
download | git-repo-e0b16a22a01c54a00a9e4a0c53dddfce3b0d59d6.tar.gz |
superproject: support a new revision attribute.
Tested:
$ ./run_tests
Verified that a manifest that specified superproject revision would use
the specified revision, and superproject will use the default revision.
Note that this is a slight behavior change from earlier repo versions,
which would always use the branch name of the manifest itself. However,
the new behavior would be more consisitent with regular "project"
element and would allow superproject be used even if it is not enabled
for the particular manifest branch, so we have decided to make the
change as it would provide more flexibility and better matches what
other elements would do.
Bug: [google internal] b/187868160
Change-Id: I35255ee347aff6e65179f7879d52931f168b477e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/317643
Tested-by: Xin Li <delphij@google.com>
Reviewed-by: Raman Tenneti <rtenneti@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'docs/manifest-format.md')
-rw-r--r-- | docs/manifest-format.md | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/manifest-format.md b/docs/manifest-format.md index 854e5e1b..ed297ae7 100644 --- a/docs/manifest-format.md +++ b/docs/manifest-format.md | |||
@@ -103,8 +103,9 @@ following DTD: | |||
103 | <!ATTLIST repo-hooks enabled-list CDATA #REQUIRED> | 103 | <!ATTLIST repo-hooks enabled-list CDATA #REQUIRED> |
104 | 104 | ||
105 | <!ELEMENT superproject EMPTY> | 105 | <!ELEMENT superproject EMPTY> |
106 | <!ATTLIST superproject name CDATA #REQUIRED> | 106 | <!ATTLIST superproject name CDATA #REQUIRED> |
107 | <!ATTLIST superproject remote IDREF #IMPLIED> | 107 | <!ATTLIST superproject remote IDREF #IMPLIED> |
108 | <!ATTLIST superproject revision CDATA #IMPLIED> | ||
108 | 109 | ||
109 | <!ELEMENT contactinfo EMPTY> | 110 | <!ELEMENT contactinfo EMPTY> |
110 | <!ATTLIST contactinfo bugurl CDATA #REQUIRED> | 111 | <!ATTLIST contactinfo bugurl CDATA #REQUIRED> |
@@ -432,6 +433,11 @@ same meaning as project's name attribute. See the | |||
432 | Attribute `remote`: Name of a previously defined remote element. | 433 | Attribute `remote`: Name of a previously defined remote element. |
433 | If not supplied the remote given by the default element is used. | 434 | If not supplied the remote given by the default element is used. |
434 | 435 | ||
436 | Attribute `revision`: Name of the Git branch the manifest wants | ||
437 | to track for this superproject. If not supplied the revision given | ||
438 | by the remote element is used if applicable, else the default | ||
439 | element is used. | ||
440 | |||
435 | ### Element contactinfo | 441 | ### Element contactinfo |
436 | 442 | ||
437 | *** | 443 | *** |