opendev/gerrit
Code Issues Proposed changes

Merge "Improve 'Push Merge Commit' access right documentation"

Browse Source
This commit is contained in:
Martin Fick
2012-01-25 08:29:51 -08:00
committed by gerrit code review
parent 9565d14e46 aef5d6e001
commit e7441caebd
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/access-control.txt
View File

@@ -619,15 +619,15 @@ The force option has no function when granted to a branch in the
[[category_push_merge]]
Upload Merge Commits
Push Merge Commits
~~~~~~~~~~~~~~~~~~~~
The `Push Merge` permits the user to upload merge commits. It's an
addon to the `Push` permission, and so it won't be sufficient
with only `Push Merge` granted for a push to happen. Some projects
wish to restrict merges to being created by Gerrit. By granting
`Push` without `Push Merge`, the only merges that enter the
system will be those created by Gerrit.
The `Push Merge Commit` permits the user to upload merge commits.
It's an addon to the <<category_push,Push>> access right, and so it
won't be sufficient with only `Push Merge Commit` granted for a push
to happen. Some projects wish to restrict merges to being created by
Gerrit. By granting `Push` without `Push Merge Commit`, the only
merges that enter the system will be those created by Gerrit.
[[category_push_annotated]]
@@ -802,7 +802,7 @@ Conversion table from 2.1.x series to 2.2.x series
|Push Branch +3 (refs/tags/*) |<<category_push_direct,Push>> (with force on refs/tags/...)
|Read +1 |<<category_read,Read>>
|Read +2 |<<category_read,Read>> & <<category_push_review,Push>> (refs/for/refs/...)
|Read +3 |<<category_read,Read>> & <<category_push_review,Push>> (refs/for/refs/...) & <<category_push_merge,Push merge>>
|Read +3 |<<category_read,Read>> & <<category_push_review,Push>> (refs/for/refs/...) & <<category_push_merge,Push Merge Commit>>
|Submit |<<category_submit,Submit>>
|=================================================================================

5
Documentation/error-not-allowed-to-upload-merges.txt
View File

@@ -7,9 +7,8 @@ project to which the push is done.
If you need to upload merge commits, you can contact one of the
project owners and request permissions to upload merge commits
(access right link:access-control.html#category_push['Push'] and
link:access-control.html#category_push_merge['Push merge']) for this
project.
(access right link:access-control.html#category_push_merge['Push Merge Commit'])
for this project.
If one of your changes could not be merged in Gerrit due to conflicts
and you created the merge commit to resolve the conflicts, you might