Reviewers: Graham Percival, Keith, c_sorensen_byu.edu, mail_philholmes.net,
J_lowe,
Message:
sorry, I uploaded this with the wrong account. The patch continues
here:
http://codereview.appspot.com/5467051/
Description:
Doc: CG: add instructions for staging branch
Please review this at http://codereview.appspot.com/5440080/
Affected files:
M Documentation/contributor/issues.itexi
M Documentation/contributor/source-code.itexi
Index: Documentation/contributor/issues.itexi
diff --git a/Documentation/contributor/issues.itexi
b/Documentation/contributor/issues.itexi
index
b72831ed2e59de4650b4eecb0fb3deff9deff8ab..fa8755c1ff025a10bcc5c7f80d20ee09169e67aa
100644
--- a/Documentation/contributor/issues.itexi
+++ b/Documentation/contributor/issues.itexi
@@ -769,6 +769,15 @@ email should contain a link to the issue you just
added.
@warning{This is not a Bug Squad responsibility; we have a
separate person handling this task.}
+For contributors/developers: follow the steps in
+@ref{Commits and patches}, and @ref{Pushing to staging}.
+
+For people doing maintenance tasks: git-cl is adding issues, James
+is testing them, Colin is selecting them for countdowns, and
+Patchy is merging from staging to master. In the coming weeks,
+these tasks will be more and more automated.
+
+@ignore
There is a single Patch Meister, and a number of Patch Helpers
(rename this?). The list of known patches awaiting review is:
@@ -806,6 +815,7 @@ message) on the webgit page:
@uref{http://git.savannah.gnu.org/gitweb/?p=lilypond.git}
@end example
@end ignore
+@ignore
@item
If the patch is clearly in response to an existing issue, then
@@ -883,7 +893,7 @@ weeks.
@end itemize
-
+@end ignore
@node Summary of project status
Index: Documentation/contributor/source-code.itexi
diff --git a/Documentation/contributor/source-code.itexi
b/Documentation/contributor/source-code.itexi
index
27d8236b64e0850783b7b5df12098ffbe6b73a5f..3f5fbd73dc606e36cc0ffb9b460f5793bef42806
100644
--- a/Documentation/contributor/source-code.itexi
+++ b/Documentation/contributor/source-code.itexi
@@ -1076,6 +1076,23 @@ running:
git cl issue 0
@end example
+@subsubheading Wait for a countdown
+
+Your patch will be available for reviews for the next few hours or
+days. Three times a week, patches with no known problems are
+gathered into a @qq{patch countdown} and their status changed to
+@code{patch-countdown}. The countdown is a 48-hour waiting period
+in which any final reviews or complaints should be made.
+
+During the countdown, your patch may be set to
+@code{patch-needs_work}, indicating that you should fix something
+(or at least discuss why the patch needs no modification). If no
+problems are found, the patch will be set to @code{patch-push}.
+
+Once a patch has @code{patch-push}, it should be sent to your
+mentor for uploading. If you have git push ability, look at
+@ref{Pushing to staging}.
+
@node Advanced Git procedures
@section Advanced Git procedures
@@ -1104,6 +1121,7 @@ several Git branches of LilyPond source code is
presented.
* Sending and receiving patches via email::
* Cleaning up multiple patches::
* Commit access::
+* Pushing to staging::
@end menu
@@ -1390,7 +1408,6 @@ remove those commits.}
@node Commit access
@subsection Commit access
-
Most contributors are not able to commit patches directly to the
main repository---only members of the LilyPond development team
have @emph{commit access}. If you are a contributor and are
@@ -1567,6 +1584,9 @@ Git properly in the previous step.
@item
Test your commit access with a dry run:
+@warning{Do not push directly to master; instead, push to staging.
+See @ref{Pushing to staging}.}
+
@example
git push --dry-run --verbose
@end example
@@ -1658,6 +1678,29 @@ broadband may use a slightly smaller MTU for
efficient transmission
over ATM. If this problem is encountered a possible work-around is
to set the MTU in the local router to 1500.
+@node Pushing to staging
+@subsection Pushing to staging
+
+Do not push directly to the git @code{master} branch. Instead,
+push to @code{staging}. Assuming that your patch is in a file
+called @file{0001-my-patch.patch}, and you are currently on git
+master, do:
+
+@example
+git checkout staging
+git pull
+git am 0001-my-patch.patch
+git push origin staging
+git checkout master
+@end example
+
+You will not see your patch on @code{master} until some automatic
+tests have been run. These tests are run every couple of hours;
+please wait at least 12 hours before wondering if your patch has
+been lost. Note that you can check the commits on @code{staging}
+by looking at the git web interface on savannah.
+
+
@node Git on Windows
@section Git on Windows
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
