From 36ea2fb6ee0f42144d44cf9aa7196bfa3b56e9e6 Mon Sep 17 00:00:00 2001 From: Anthony King Date: Tue, 6 May 2014 11:54:01 +0100 Subject: 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 --- docs/manifest-format.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs') 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: + @@ -112,6 +113,10 @@ Attribute `review`: Hostname of the Gerrit server where reviews are uploaded to by `repo upload`. This attribute is optional; if not specified then `repo upload` will not function. +Attribute `revision`: Name of a Git branch (e.g. `master` or +`refs/heads/master`). Remotes with their own revision will override +the default revision. + Element default --------------- @@ -208,7 +213,8 @@ to track for this project. Names can be relative to refs/heads (e.g. just "master") or absolute (e.g. "refs/heads/master"). Tags and/or explicit SHA-1s should work in theory, but have not been extensively tested. If not supplied the revision given by -the default element is used. +the remote element is used if applicable, else the default +element is used. Attribute `dest-branch`: Name of a Git branch (e.g. `master`). When using `repo upload`, changes will be submitted for code -- cgit v1.2.3-54-g00ecf