From: Marius Bakke <mbakke@fastmail.com>
To: Oleg Pykhalov <go.wigust@gmail.com>, Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org
Subject: Re: 01/01: gnu: cmake: Delete Emacs library.
Date: Sat, 26 May 2018 15:37:02 +0200 [thread overview]
Message-ID: <87y3g6edxd.fsf@fastmail.com> (raw)
In-Reply-To: <87k1rsxdbg.fsf@gmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 976 bytes --]
Oleg Pykhalov <go.wigust@gmail.com> writes:
> Hello Mark,
>
> Thank you for explanation of procedure and macro specifications.
> I've pushed ffd526e61ab1b45c6c913ab4e139193e4d5bee9b with a fix.
>
> Also, here is a patch to mention core-updates-next in the documentation.
>
> diff --git a/doc/contributing.texi b/doc/contributing.texi
> index 2792fe2b2..1c33430aa 100644
> --- a/doc/contributing.texi
> +++ b/doc/contributing.texi
> @@ -410,7 +410,8 @@ to be merged in @code{master} every 3 weeks or so. Topical changes
> @item more than 1,200 dependent packages
> @code{core-updates} branch (may include major and potentially disruptive
> changes). This branch is intended to be merged in @code{master} every
> -2.5 months or so.
> +2.5 months or so. Also during official frozen period commits should go
> +to @code{core-updates-next}.
> @end table
Good idea. It would be good to clarify that this also applies for
'staging'. What do you think about this instead?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Type: text/x-patch, Size: 1086 bytes --]
1 file changed, 9 insertions(+), 2 deletions(-)
doc/contributing.texi | 11 +++++++++--
modified doc/contributing.texi
@@ -413,12 +413,19 @@ changes). This branch is intended to be merged in @code{master} every
2.5 months or so.
@end table
-All these branches are tracked by our build farm
-and merged into @code{master} once
+All these branches are @uref{https://hydra.gnu.org/project/gnu,
+tracked by our build farm} and merged into @code{master} once
everything has been successfully built. This allows us to fix issues
before they hit users, and to reduce the window during which pre-built
binaries are not available.
+Generally, branches other than @code{master} are considered
+@emph{frozen} if there has been a recent evaluation, or there is a
+corresponding @code{-next} branch. Please ask on the mailing list or
+IRC if unsure where to place a patch.
+@c TODO: It would be good with badges on the website that tracks these
+@c branches. Or maybe even a status page.
+
@item
@cindex determinism, of build processes
@cindex reproducible builds, checking
[back]
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
next prev parent reply other threads:[~2018-05-26 13:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180522141738.8231.26687@vcs0.savannah.gnu.org>
[not found] ` <20180522141741.641D120711@vcs0.savannah.gnu.org>
2018-05-22 18:43 ` 01/01: gnu: cmake: Delete Emacs library Mark H Weaver
2018-05-23 16:10 ` Oleg Pykhalov
2018-05-24 1:35 ` Mark H Weaver
2018-05-25 10:02 ` Oleg Pykhalov
2018-05-26 13:37 ` Marius Bakke [this message]
2018-05-28 9:41 ` Ludovic Courtès
2018-05-28 9:55 ` Vincent Legoll
2018-06-16 19:44 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y3g6edxd.fsf@fastmail.com \
--to=mbakke@fastmail.com \
--cc=go.wigust@gmail.com \
--cc=guix-devel@gnu.org \
--cc=mhw@netris.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.