From c872f352735c731958da165c83ea8598c5d58772 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 18 Jul 2012 16:18:33 +0200 Subject: [PATCH] CG: clarify staging branch policy The big paragraph is suggested by David Kastrup in http://lists.gnu.org/archive/html/lilypond-devel/2012-07/msg00472.html --- Documentation/contributor/administration.itexi | 3 +++ Documentation/contributor/source-code.itexi | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/Documentation/contributor/administration.itexi b/Documentation/contributor/administration.itexi index 88c66bea77..73c317855e 100644 --- a/Documentation/contributor/administration.itexi +++ b/Documentation/contributor/administration.itexi @@ -254,6 +254,9 @@ these complete error-free. If you have set Patchy up to use email, it emails its results to you. If you haven't, then you can view them in a logfile. It also merges @code{staging} into @code{master}. +@warning{in case the build fails, do not try to push fixes on top of +staging branch, for details see @ref{Pushing to staging}.} + When you have run Patchy a few successful times with email sending, you are ready for running it as a cron job. First, make sure you have the following in @file{$HOME/.lilypond-patchy-config} to avoid diff --git a/Documentation/contributor/source-code.itexi b/Documentation/contributor/source-code.itexi index 7ec9022f59..2567484e70 100644 --- a/Documentation/contributor/source-code.itexi +++ b/Documentation/contributor/source-code.itexi @@ -2044,6 +2044,15 @@ patch has been lost. Note that you can check the commits on @code{origin/staging} by looking at the git web interface on savannah. +It may happen occasionally that the staging branch breaks automated +testing. In this case the automatic move of staging material to +master gets halted in order to avoid broken material entering master. +This is a safety net. Please do not try breaking out from it by +adding fixes on top of staging: in that case the whole sequence will +end up in master after all, defeating the purpose of the system. The +proper fix usually involves rewriting the staging branch and is best +left to core developers after discussion on the developer list. + @subsubheading If your work is in a patch file Assuming that your patch is in a file called -- 2.39.2