From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 7 Mar 2018 17:33:54 +0000 (-0500)
Subject: Improve 'Update an existing patch' section
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F9319%2F2;p=releng%2Fdocs.git

Improve 'Update an existing patch' section

Add more details and reword some of the sections so that it is more
complete. Pull in some information from the OpenDaylight docs wiki
https://wiki.opendaylight.org/view/Documentation/Tools#Common_Doc_Tasks

Issue: https://jira.opendaylight.org/browse/DOCS-41
Change-Id: Ie683c4cea16be40525e8af6788e884fafc3d2e86
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/docs/gerrit.rst b/docs/gerrit.rst
index 4920e96..8feca45 100644
--- a/docs/gerrit.rst
+++ b/docs/gerrit.rst
@@ -269,38 +269,63 @@ change number.
 Update an existing patch
 ========================
 
-#. On your machine, open a shell and switch to the directory containing the repository. Then
-   download the patch you want to update:
+In a healthy Open Source project code reviews will happen and we will need to
+amend the patches until reviewers are happy with the change. This section will
+walk through the process of updating a patch that is already in
+Gerrit Code Review.
+
+#. Open a shell to the directory containing the project repo
+#. Pull the latest version of the patch from Gerrit
 
    .. code-block:: bash
 
       git review -d ${change_number}
 
-   (Optional) View information on the latest changes made to that patch:
-   To view the edited files, run
+   The change number is in the URL of the Gerrit patch.
 
-   .. code-block:: bash
+   (Optional) View information on the latest changes made to that patch.
+
+   * To view the edited files, run ``git show``.
+   * To view a listing of the edited files and the number of lines in those
+     files, run ``git show --stat``.
+
+#. Rebase the patch before you start working on it
 
-      git show
+   .. code-block::
 
-#. To view a listing of the edited files and the number of lines in those files, run:
+      git pull --rebase
+
+   This is to ensure that the patch incorporates the latest version of the
+   repo and is not out of date.
+
+#. Make the necessary changes to the patch with your favorite editor
+#. Check the state of the repo by running ``git status``
+#. Stage the modified files for commit. (Repeat for all files modified)
 
    .. code-block:: bash
 
-      git show --stat
+      git add /path/to/file
 
-#. Make the necessary changes to the patch’s files and commit your changes using:
+#. Verify the staged files by running ``git status``
+#. Commit the staged files by amending the patch
 
    .. code-block:: bash
 
-      git commit -a --amend
+      git commit --amend
 
 #. Update the current patch description and then save the commit request.
 
-   .. note::
+   If you feel as though you added enough work on the patch, add your name
+   in the footer with a line ``Co-Authored-By: Firstname Lastname <email>``.
+
+#. Rebase the patch one last time
+
+   .. code-block::
+
+      git pull --rebase
 
-      If you feel as though you added enough work on the patch, add your name in
-      the footer with a line like Co-Authored-By: First Last <email>.
+   This is to ensure that the patch incorporates the latest version of the
+   repo and is not out of date.
 
 #. Submit your files for review:
 
@@ -308,9 +333,10 @@ Update an existing patch
 
       git review
 
-You will receive 2 emails from Gerrit Code Review: the first indicating that a build
-to incorporate your changes has started; and the second indicating the creation of the
-build.
+You will receive 2 emails from Gerrit Code Review: the first indicating that
+a build to incorporate your changes has started; and the second indicating
+the whether the build passed or failed. Refer to the console logs if the
+build has failed and amend the patch as necessary.
 
 Update a patch with dependent changes
 =====================================