diff options
| author | Bryan Jacobs <bryanrj@gmail.com> | 2013-05-06 13:36:24 -0400 |
|---|---|---|
| committer | Bryan Jacobs <bryanrj@gmail.com> | 2013-05-24 12:17:22 -0400 |
| commit | f609f91b72c0b90026da0eefcc0f52f12840971b (patch) | |
| tree | 819e244e52279d7b232df5e17727a9a828ddda66 /docs | |
| parent | 59bbb580e34bbc5dce76dacaad9ff94f21fa396f (diff) | |
| download | git-repo-f609f91b72c0b90026da0eefcc0f52f12840971b.tar.gz | |
Send reviews to a different branch from fetch
This adds the ability to have reviews pushed to a different branch
from the one on which changes are based. This is useful for "gateway"
systems without smartsync.
Change-Id: I3a8a0fabcaf6055e62d3fb55f89c944e2f81569f
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manifest-format.txt | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/docs/manifest-format.txt b/docs/manifest-format.txt index 59f6a2fd..dcc90d07 100644 --- a/docs/manifest-format.txt +++ b/docs/manifest-format.txt | |||
| @@ -37,24 +37,26 @@ following DTD: | |||
| 37 | <!ATTLIST remote review CDATA #IMPLIED> | 37 | <!ATTLIST remote review CDATA #IMPLIED> |
| 38 | 38 | ||
| 39 | <!ELEMENT default (EMPTY)> | 39 | <!ELEMENT default (EMPTY)> |
| 40 | <!ATTLIST default remote IDREF #IMPLIED> | 40 | <!ATTLIST default remote IDREF #IMPLIED> |
| 41 | <!ATTLIST default revision CDATA #IMPLIED> | 41 | <!ATTLIST default revision CDATA #IMPLIED> |
| 42 | <!ATTLIST default sync-j CDATA #IMPLIED> | 42 | <!ATTLIST default dest-branch CDATA #IMPLIED> |
| 43 | <!ATTLIST default sync-c CDATA #IMPLIED> | 43 | <!ATTLIST default sync-j CDATA #IMPLIED> |
| 44 | <!ATTLIST default sync-s CDATA #IMPLIED> | 44 | <!ATTLIST default sync-c CDATA #IMPLIED> |
| 45 | <!ATTLIST default sync-s CDATA #IMPLIED> | ||
| 45 | 46 | ||
| 46 | <!ELEMENT manifest-server (EMPTY)> | 47 | <!ELEMENT manifest-server (EMPTY)> |
| 47 | <!ATTLIST url CDATA #REQUIRED> | 48 | <!ATTLIST url CDATA #REQUIRED> |
| 48 | 49 | ||
| 49 | <!ELEMENT project (annotation?, | 50 | <!ELEMENT project (annotation?, |
| 50 | project*)> | 51 | project*)> |
| 51 | <!ATTLIST project name CDATA #REQUIRED> | 52 | <!ATTLIST project name CDATA #REQUIRED> |
| 52 | <!ATTLIST project path CDATA #IMPLIED> | 53 | <!ATTLIST project path CDATA #IMPLIED> |
| 53 | <!ATTLIST project remote IDREF #IMPLIED> | 54 | <!ATTLIST project remote IDREF #IMPLIED> |
| 54 | <!ATTLIST project revision CDATA #IMPLIED> | 55 | <!ATTLIST project revision CDATA #IMPLIED> |
| 55 | <!ATTLIST project groups CDATA #IMPLIED> | 56 | <!ATTLIST project dest-branch CDATA #IMPLIED> |
| 56 | <!ATTLIST project sync-c CDATA #IMPLIED> | 57 | <!ATTLIST project groups CDATA #IMPLIED> |
| 57 | <!ATTLIST project sync-s CDATA #IMPLIED> | 58 | <!ATTLIST project sync-c CDATA #IMPLIED> |
| 59 | <!ATTLIST project sync-s CDATA #IMPLIED> | ||
| 58 | <!ATTLIST project upstream CDATA #IMPLIED> | 60 | <!ATTLIST project upstream CDATA #IMPLIED> |
| 59 | <!ATTLIST project clone-depth CDATA #IMPLIED> | 61 | <!ATTLIST project clone-depth CDATA #IMPLIED> |
| 60 | <!ATTLIST project force-path CDATA #IMPLIED> | 62 | <!ATTLIST project force-path CDATA #IMPLIED> |
| @@ -125,6 +127,11 @@ Attribute `revision`: Name of a Git branch (e.g. `master` or | |||
| 125 | `refs/heads/master`). Project elements lacking their own | 127 | `refs/heads/master`). Project elements lacking their own |
| 126 | revision attribute will use this revision. | 128 | revision attribute will use this revision. |
| 127 | 129 | ||
| 130 | Attribute `dest-branch`: Name of a Git branch (e.g. `master`). | ||
| 131 | Project elements not setting their own `dest-branch` will inherit | ||
| 132 | this value. If this value is not set, projects will use `revision` | ||
| 133 | by default instead. | ||
| 134 | |||
| 128 | Attribute `sync_j`: Number of parallel jobs to use when synching. | 135 | Attribute `sync_j`: Number of parallel jobs to use when synching. |
| 129 | 136 | ||
| 130 | Attribute `sync_c`: Set to true to only sync the given Git | 137 | Attribute `sync_c`: Set to true to only sync the given Git |
| @@ -203,6 +210,11 @@ Tags and/or explicit SHA-1s should work in theory, but have not | |||
| 203 | been extensively tested. If not supplied the revision given by | 210 | been extensively tested. If not supplied the revision given by |
| 204 | the default element is used. | 211 | the default element is used. |
| 205 | 212 | ||
| 213 | Attribute `dest-branch`: Name of a Git branch (e.g. `master`). | ||
| 214 | When using `repo upload`, changes will be submitted for code | ||
| 215 | review on this branch. If unspecified both here and in the | ||
| 216 | default element, `revision` is used instead. | ||
| 217 | |||
| 206 | Attribute `groups`: List of groups to which this project belongs, | 218 | Attribute `groups`: List of groups to which this project belongs, |
| 207 | whitespace or comma separated. All projects belong to the group | 219 | whitespace or comma separated. All projects belong to the group |
| 208 | "all", and each project automatically belongs to a group of | 220 | "all", and each project automatically belongs to a group of |