all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: John Kehayias <john.kehayias@protonmail.com>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: Attila Lendvai <attila@lendvai.name>,
	Philip McGrath <philip@philipmcgrath.com>,
	Saku Laesvuori <saku@laesvuori.fi>,
	Liliana Marie Prikler <liliana.prikler@gmail.com>,
	guix-devel@gnu.org, dan <i@dan.games>,
	69461@debbugs.gnu.org
Subject: Re: Should commits rather be buildable or small
Date: Mon, 04 Mar 2024 21:38:36 +0000	[thread overview]
Message-ID: <87jzmhad9s.fsf@protonmail.com> (raw)
In-Reply-To: <87fs09ar56.fsf@elephly.net>

Hi everyone,

And sorry for reviving an old thread, but I am faced with a similar issue for updating vulkan, with the patch series submitted by dan (cc'ed): <https://issues.guix.gnu.org/69461>. I thought I would get some opinions here, please see below:

On Mon, Dec 11, 2023 at 12:51 PM, Ricardo Wurmus wrote:

> Attila Lendvai <attila@lendvai.name> writes:
>
>> i myself also had headaches multiple times when i fixed something that
>> needed to touch several different packages, and they would only work
>> when applied in one transaction:
>>

In this case all the vulkan packages share a version through a variable name. I would assume packages wouldn't like mixed versions, but maybe some would work (I haven't tried). I'll be taking this series on mesa-updates with related changes, so the plan is that when it hits master there are no/few broken packages and full substitute coverage. So perhaps this makes this more of a style and convention question.

Some options:

1. Essentially squash to one commit where all of vulkan is updated in one commit. The main upside is that nothing should break (within vulkan, dependents to be fixed as needed) and it shows as "one" change; the main downside is that the proposed changes are not just trivial version bumps. Harder to then disentangle as needed.

2. Make each commit updating a package, but don't use the variable %vulkan-sdk-version, updating each package with a version as it is done. Then do a commit where all the versions are replaced by the variable. This seems like unnecessary work to me and while it stops the obvious breaking (source hashes don't match once variable is updated but package hasn't yet) versions are still mixed which is likely a problem.

3. Go with the series as proposed: this means after the first commit for sure all other vulkan packages and dependents don't build, as the source hashes won't match until the commit that updates that package. Along with version mixing, this perhaps doesn't give you a helpful git bisect either?

None are perfect. What do people think?

My instinct is to go with the series as proposed (after review) accepting that there will be for sure builds failing if time traveling to the middle of the series. I don't think we can really avoid that anyway, as sometimes we only see an issue after a commit and it is fixed some time later. We could have a note in the first commit that this requires the next n commits to update vulkan packages. That might help if someone is on an intermediate commit and can see quickly in git log this note.

Or perhaps we can note something is part of a dependent series when we make commits so this is easier for someone to tell in general?

Thanks!
John



  reply	other threads:[~2024-03-04 21:39 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-08  8:42 Should commits rather be buildable or small Saku Laesvuori
2023-12-08 11:41 ` Tomas Volf
2023-12-08 12:05 ` Lars-Dominik Braun
2023-12-08 16:35   ` Felix Lechner via Development of GNU Guix and the GNU System distribution.
2023-12-08 15:44 ` Liliana Marie Prikler
2023-12-10 15:28   ` Saku Laesvuori
2023-12-10 15:50     ` Liliana Marie Prikler
2023-12-10 17:02     ` Attila Lendvai
2023-12-10 17:50       ` Ricardo Wurmus
2023-12-10 23:20         ` Attila Lendvai
2023-12-10 23:56           ` Philip McGrath
2023-12-11 10:51             ` Attila Lendvai
2023-12-11 11:51               ` Ricardo Wurmus
2024-03-04 21:38                 ` John Kehayias [this message]
2024-03-05  4:32                   ` dan
2024-03-05  5:19                   ` Liliana Marie Prikler
2024-03-25  1:15                     ` John Kehayias
2024-03-25  3:23                       ` dan
2024-03-25  3:23                         ` [bug#69461] " dan

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=87jzmhad9s.fsf@protonmail.com \
    --to=john.kehayias@protonmail.com \
    --cc=69461@debbugs.gnu.org \
    --cc=attila@lendvai.name \
    --cc=guix-devel@gnu.org \
    --cc=i@dan.games \
    --cc=liliana.prikler@gmail.com \
    --cc=philip@philipmcgrath.com \
    --cc=rekado@elephly.net \
    --cc=saku@laesvuori.fi \
    /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.