Re: CG: clarify staging branch policy (issue 6425045)

[john . mandereau]

Reviewers: janek, dak,

Message:
Pushed to staging after moving the @warning as suggested.


http://codereview.appspot.com/6425045/diff/1/Documentation/contributor/administration.itexi
File Documentation/contributor/administration.itexi (right):

http://codereview.appspot.com/6425045/diff/1/Documentation/contributor/administration.itexi#newcode280
Documentation/contributor/administration.itexi:280: @warning{in case the
build fails, do not try to push fixes on top of
On 2012/07/18 15:39:36, dak wrote:
> The placement of this warning in the middle of the cron instructions
seems a bit
> weird.  It seems like it belongs either at the end of the section, or
somewhere
> close to where the motivation of staging-patchy is explained.

You're right, I moved it after line 255
"them in a logfile. It also merges @code{staging} into @code{master}."

Description:
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

Please review this at http://codereview.appspot.com/6425045/

Affected files:
  M Documentation/contributor/administration.itexi
  M Documentation/contributor/source-code.itexi


Index: Documentation/contributor/administration.itexi
diff --git a/Documentation/contributor/administration.itexi  
b/Documentation/contributor/administration.itexi
index  
88c66bea775ba1c741463d11c79d42fb1bf98499..8b2856c8a8792911a5d8cca6e74e4ecb7ba56560  
100644
--- a/Documentation/contributor/administration.itexi
+++ b/Documentation/contributor/administration.itexi
@@ -277,6 +277,9 @@ your main setup, so you must re-define any variables  
inside
 may need to be defined if @var{git_repository_dir} is not correctly
 set in @file{$HOME/.lilypond-patchy-config}.}

address@hidden case the build fails, do not try to push fixes on top of
+staging branch, for details see @ref{Pushing to staging}.}
+
 Finally, install the cron job (you may need superuser privileges for
 this):
 @example
Index: Documentation/contributor/source-code.itexi
diff --git a/Documentation/contributor/source-code.itexi  
b/Documentation/contributor/source-code.itexi
index  
7ec9022f5994b55b4195bea2b18b691871dd324c..2567484e7075ab4627ad1ab8c51479d9a275ea4f  
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