opendev
/
infra-manual
Code Issues Proposed changes

Fix section ordering 

The section "Rebasing a commit" was in the middle of the
"Cross-Repository Dependencies" section, move it in front of it.

Change-Id: I0741ac879de1375fc42bcaca4f172fc8455b4f7c
This commit is contained in:
Andreas Jaeger 2017-06-27 07:35:09 +02:00
parent 24a0c17242
commit afabe8e5c9
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
doc/source/developers.rst
View File

@ -555,30 +555,6 @@ want the rebase behavior in git review. If you would rather postpone
resolving merge conflicts you can use git review ``-R`` as the last step
above.
Cross-Repository Dependencies
-----------------------------
If your change has a dependency on a change outside of that
repository, like a change for another repository or some manual
setup, you have to ensure that the change merge at the right time.
For a change depending on a manual setup, mark your change with the
"Work in Progress" label until the manual setup is done. A core
reviewer might also block an important change with a -2 so that it
does not get merged accidentally before the manual setup is done.
If your change has a dependency on a change in another repository,
you can use cross-repo dependencies (CRD) in Zuul:
* To use them, include "Depends-On: <gerrit-change-id>" in the footer
of your commit message. Use the full Change-ID ('I' + 40
characters). A patch can also depend on multiple changes as
explained in :ref:`multiple_changes`.
* These are one-way dependencies only -- do not create a cycle.
Rebasing a commit
-----------------
@ -620,6 +596,29 @@ be done manually:
$ git status
$ git rebase --continue
Cross-Repository Dependencies
-----------------------------
If your change has a dependency on a change outside of that
repository, like a change for another repository or some manual
setup, you have to ensure that the change merge at the right time.
For a change depending on a manual setup, mark your change with the
"Work in Progress" label until the manual setup is done. A core
reviewer might also block an important change with a -2 so that it
does not get merged accidentally before the manual setup is done.
If your change has a dependency on a change in another repository,
you can use cross-repo dependencies (CRD) in Zuul:
* To use them, include "Depends-On: <gerrit-change-id>" in the footer
of your commit message. Use the full Change-ID ('I' + 40
characters). A patch can also depend on multiple changes as
explained in :ref:`multiple_changes`.
* These are one-way dependencies only -- do not create a cycle.
Gate Pipeline
^^^^^^^^^^^^^
@ -731,6 +730,7 @@ will not help. Zuul waits for a status change and does not see it. The
change needs another approval or a toggle of the approval, toggle
means removing the approval and readding it again.
Code Review
===========