From: ludo@gnu.org (Ludovic Courtès)
To: Andreas Enge <andreas@enge.fr>
Cc: guix-devel@gnu.org
Subject: Topic branches
Date: Sun, 01 Sep 2013 22:13:38 +0200 [thread overview]
Message-ID: <878uzgfggd.fsf_-_@gnu.org> (raw)
In-Reply-To: <20130901195046.GA4912@debian> (Andreas Enge's message of "Sun, 1 Sep 2013 21:50:46 +0200")
Andreas Enge <andreas@enge.fr> skribis:
> On Sun, Sep 01, 2013 at 09:40:27PM +0200, Ludovic Courtès wrote:
>> Speaking of which: in the future, we should use topic branches for such
>> things, to avoid disrupting the main branch. For instance, I’ve locally
>> switched back to Python 2 as the default since I was otherwise unable to
>> use the QEMU-related things.
>>
>> Actually it’s not too late: we could create a new branch off ‘master’,
>> and just switch back to Python 2 as the default on ‘master’. Hydra can
>> be told to build the new branch in addition to ‘master’.
>
> Actually, 77c7f8f41b558bab13690c843068af8ba996e5bf switches back (while
> keeping the definition of Python 3 in the variable python-3; but all
> packages using python as input will get Python 2).
Ah right, thanks!
> We could create branches; very often (like here, with changes to the python
> build system pending), we might as well use core-updates directly.
Experience with Nixpkgs suggests that topic branches are better:
core-updates does rebuild-the-world changes, so you don’t want to merge
it lightly, and not too often; conversely the Python changes are
relatively isolated.
More importantly, intermingling the effects of the Python changes with
that of (say) a GCC and glibc upgrade is undesirable, as it makes it
harder to determine the cause of a problem.
Thanks,
Ludo’.
next prev parent reply other threads:[~2013-09-01 20:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 23:03 [PATCH] gnu: Add Python 3 Cyril Roelandt
2013-08-28 13:03 ` Ludovic Courtès
2013-08-28 14:12 ` Andreas Enge
2013-08-28 14:40 ` Ludovic Courtès
2013-08-28 20:58 ` Andreas Enge
2013-08-28 22:07 ` Ludovic Courtès
2013-09-01 14:07 ` Ludovic Courtès
2013-09-01 14:41 ` Andreas Enge
2013-09-01 19:40 ` Ludovic Courtès
2013-09-01 19:50 ` Andreas Enge
2013-09-01 20:13 ` Ludovic Courtès [this message]
2013-09-02 20:19 ` Topic branches Andreas Enge
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=878uzgfggd.fsf_-_@gnu.org \
--to=ludo@gnu.org \
--cc=andreas@enge.fr \
--cc=guix-devel@gnu.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.