Skip to content

Commit

Permalink
How to update patches with dependent changes
Browse files Browse the repository at this point in the history
Add details on how to update patches that have dependent
changes in Gerrit.

Issue: https://jira.opendaylight.org/browse/DOCS-21
Change-Id: Id4cd47bcb6e6aee08ae64a2d6e19153e14c3c5f4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
  • Loading branch information
zxiiro authored and jwagantall committed Mar 12, 2018
1 parent 915394c commit bc9d2ce
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions docs/gerrit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,32 @@ You will receive 2 emails from Gerrit Code Review: the first indicating that a b
to incorporate your changes has started; and the second indicating the creation of the
build.

Update a patch with dependent changes
=====================================

In the case where a patch depends on another in review Gerrit patch, we will
need to rebase the commit against the latest patchset of the dependent change
in Gerrit. The best way to do this is to retrieve the latest version of the
dependent change and then cherry-pick our patch on top of the change.

#. Fetch latest parent patch set

.. code-block:: bash
git review -d <parent-gerrit-id>
#. Cherry-pick out patch on top

.. code-block:: bash
git review -x <patch-gerrit-id>
#. Push patch back up to Gerrit

.. code-block:: bash
git review -R
Code Review
===========

Expand Down

0 comments on commit bc9d2ce

Please sign in to comment.