summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAnthony King <anthonydking@slimroms.net>2014-05-06 11:54:01 +0100
committerAnthony King <anthonydking@slimroms.net>2014-05-07 08:29:30 +0000
commit36ea2fb6ee0f42144d44cf9aa7196bfa3b56e9e6 (patch)
tree34fc7410de43113f50cf9bdd36c5f8144316eca0 /docs
parent666d534636d262cbfd971509dd0f0be0cddb2e11 (diff)
downloadgit-repo-36ea2fb6ee0f42144d44cf9aa7196bfa3b56e9e6.tar.gz
Enable remotes to define their own revision
Some projects use multiple remotes. In some cases these remotes have different naming conventions. Add an option to define a revision in the remote configuration. The `project` revision takes precedence over `remote` and `default`. The `remote` revision takes precedence over `default`. The `default` revision acts as a fall back as it originally did. Change-Id: I2b376160d45d48b0bab840c02a3eef1a1e32cf6d
Diffstat (limited to 'docs')
-rw-r--r--docs/manifest-format.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/manifest-format.txt b/docs/manifest-format.txt
index e48b75fe..f187bfaf 100644
--- a/docs/manifest-format.txt
+++ b/docs/manifest-format.txt
@@ -35,6 +35,7 @@ following DTD:
35 <!ATTLIST remote alias CDATA #IMPLIED> 35 <!ATTLIST remote alias CDATA #IMPLIED>
36 <!ATTLIST remote fetch CDATA #REQUIRED> 36 <!ATTLIST remote fetch CDATA #REQUIRED>
37 <!ATTLIST remote review CDATA #IMPLIED> 37 <!ATTLIST remote review CDATA #IMPLIED>
38 <!ATTLIST remote revision CDATA #IMPLIED>
38 39
39 <!ELEMENT default (EMPTY)> 40 <!ELEMENT default (EMPTY)>
40 <!ATTLIST default remote IDREF #IMPLIED> 41 <!ATTLIST default remote IDREF #IMPLIED>
@@ -112,6 +113,10 @@ Attribute `review`: Hostname of the Gerrit server where reviews
112are uploaded to by `repo upload`. This attribute is optional; 113are uploaded to by `repo upload`. This attribute is optional;
113if not specified then `repo upload` will not function. 114if not specified then `repo upload` will not function.
114 115
116Attribute `revision`: Name of a Git branch (e.g. `master` or
117`refs/heads/master`). Remotes with their own revision will override
118the default revision.
119
115Element default 120Element default
116--------------- 121---------------
117 122
@@ -208,7 +213,8 @@ to track for this project. Names can be relative to refs/heads
208(e.g. just "master") or absolute (e.g. "refs/heads/master"). 213(e.g. just "master") or absolute (e.g. "refs/heads/master").
209Tags and/or explicit SHA-1s should work in theory, but have not 214Tags and/or explicit SHA-1s should work in theory, but have not
210been extensively tested. If not supplied the revision given by 215been extensively tested. If not supplied the revision given by
211the default element is used. 216the remote element is used if applicable, else the default
217element is used.
212 218
213Attribute `dest-branch`: Name of a Git branch (e.g. `master`). 219Attribute `dest-branch`: Name of a Git branch (e.g. `master`).
214When using `repo upload`, changes will be submitted for code 220When using `repo upload`, changes will be submitted for code