From: Chris Marusich <cmmarusich@gmail.com>
To: guix-devel@gnu.org
Subject: Branch management, wip-ppc64le, and POWER9
Date: Thu, 04 Feb 2021 00:56:48 -0800 [thread overview]
Message-ID: <87k0romcrz.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]
Hi,
Since I'm now making commits on wip-ppc64le to add support for POWER9
machines like the Talos II and Blackbird from Raptor Computing Systems,
I'd like to understand more about how I am expected to manage that
branch. Before I touched it, it sat with just one lonely commit,
essentially unused. So it seems to me like I'm not stepping on anyone's
toes, and that I should just make commits like I normally would on
master, staging, or core-updates, being careful to follow the usual
guidelines.
Specifically, I'm curious to know:
- Is it usually expected that wip branches can be rebased? I don't plan
to rebase wip-ppc64le, since I'd like to be able to coordinate with
others using this branch, but I'm not sure what others expect.
- Should I just periodically merge from master, or perhaps core-updates,
to keep wip-ppc64le up to date and resolve conflicts early? I've
already merged master into this branch once, to get it back up to
date. I haven't merged core-updates into it yet. I think
periodically merging branches into wip-ppc64le is the right thing to
do, since eventually the end goal will be to merge wip-ppc64le into
core-updates to get POWER9 support into a release. However, I suppose
if I merge from different branches, I could wind up dealing with
unnecessary conflicts.
- For Efraim specifically, there is some overlap between the work
required on wip-ppc64le and the work required on wip-ppc. I have
already cherry-picked one of your commits
(2da8fcfdee7cfde8110a68806f3c4d497f217fe5) onto wip-ppc64le (as commit
52f0b3db6ef3d3c5067c704c2190f72d2994a999), since it was needed. How
would you like to coordinate this work?
- Are there any other tips/advice/rules?
Thank you,
--
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
next reply other threads:[~2021-02-04 8:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 8:56 Chris Marusich [this message]
2021-02-04 9:38 ` Branch management, wip-ppc64le, and POWER9 Christopher Baines
2021-02-04 18:53 ` Leo Famulari
2021-02-04 18:57 ` Leo Famulari
2021-02-07 3:04 ` Chris Marusich
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=87k0romcrz.fsf@gmail.com \
--to=cmmarusich@gmail.com \
--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.