opendev/gerrit
Code Issues Proposed changes

Merge "doc: Clarify change dependency handling of submit types"

Browse Source
This commit is contained in:
David Pursehouse 2016-05-02 01:15:17 +00:00 committed by Gerrit Code Review
commit 221415d298
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/project-configuration.txt
View File

@ -53,7 +53,9 @@ Either restart the server, or flush the `project_list` cache:
The method Gerrit uses to submit a change to a project can be The method Gerrit uses to submit a change to a project can be
modified by any project owner through the project console, `Projects` > modified by any project owner through the project console, `Projects` >
`List` > my/project. The following methods are supported: `List` > my/project. In general, a submitted change is only merged if all
its dependencies are also submitted, with exceptions documented below.
The following submit types are supported:
[[fast_forward_only]] [[fast_forward_only]]
* Fast Forward Only * Fast Forward Only
@ -96,10 +98,12 @@ and a URL link back to the change on the web. The committer header
is also set to the submitter, while the author header retains the is also set to the submitter, while the author header retains the
original patch set author. original patch set author.
+ +
Note that Gerrit ignores patch set dependencies when operating in Note that Gerrit ignores dependencies between changes when using this
cherry-pick mode. Submitters must remember to submit changes in submit type unless
the right order since inter-change dependencies will not be link:config-gerrit.html#change.submitWholeTopic[`change.submitWholeTopic`]
enforced for them. is enabled and depending changes share the same topic. So generally
submitters must remember to submit changes in the right order when using this
submit type.
[[rebase_if_necessary]] [[rebase_if_necessary]]
* Rebase If Necessary * Rebase If Necessary