From aef5d6e001922f1bbeb73fd76e0ab92d8ba3a289 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 24 Jan 2012 09:04:54 +0100 Subject: [PATCH] Improve 'Push Merge Commit' access right documentation In the documentation the 'Push Merge Commit' access right was named 'Push Merge'. Correct the name to be consistent with the name that is displayed in the Gerrit WebUI. In addition remove the link to the 'Push' access right from the documentation of the error 'you are not allowed to upload merges'. When the user gets this error he has already the 'Push' access right assigned and only 'Push Merge Commit' is missing. If 'Push' would be missing the user would get an 'Upload Denied' error. Also the 'Push Merge Commit' documentation explains that it requires 'Push'. This means just having the link to 'Push Merge Commit' should be sufficiant for the 'you are not allowed to upload merges' error description. Change-Id: Idfec58e52ba77c967abb97deb6cc90f42c3395d9 Signed-off-by: Edwin Kempin --- Documentation/access-control.txt | 16 ++++++++-------- .../error-not-allowed-to-upload-merges.txt | 5 ++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index 103bbaae60..70c58a252b 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt @@ -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 <> 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/*) |<> (with force on refs/tags/...) |Read +1 |<> |Read +2 |<> & <> (refs/for/refs/...) -|Read +3 |<> & <> (refs/for/refs/...) & <> +|Read +3 |<> & <> (refs/for/refs/...) & <> |Submit |<> |================================================================================= diff --git a/Documentation/error-not-allowed-to-upload-merges.txt b/Documentation/error-not-allowed-to-upload-merges.txt index 9aa144a028..981ba91ccc 100644 --- a/Documentation/error-not-allowed-to-upload-merges.txt +++ b/Documentation/error-not-allowed-to-upload-merges.txt @@ -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