all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Katherine Cox-Buday <cox.katherine.e@gmail.com>
To: guix-devel@gnu.org
Subject: Re: Branch (and team?) for mesa updates
Date: Wed, 5 Jul 2023 09:47:06 -0600	[thread overview]
Message-ID: <u8439q$69v$1@ciao.gmane.io> (raw)
In-Reply-To: <ZKFRsV5Cw-u0xIZ_@jurong>

On 7/2/23 4:30 AM, Andreas Enge wrote:

> So I would suggest to delete every branch right after merging, and then
> branch off of master later when a new patch is going to be applied.
> This will also create a cleaner history by avoiding a merge.

I disagree with this because it seems like Mesa moves along at a pretty 
brisk pace and I feel like we'd be constantly recreating the same branch:

23.1.3, 2023-06-22 (14 days)
23.1.2, 2023-06-08 ( 9 days)
23.0.4, 2023-05-30 ( 5 days)
23.1.1, 2023-05-25 (15 days)
23.1.0, 2023-05-10

And so on.

 >> Am Mon, Jun 19, 2023 at 06:25:04PM +0000 schrieb John Kehayias:
 >> Master can be merged into this branch just prior to a patches going 
to this branch with the expectation merging back to master will be soon 
after and changes are only affecting packages that won't be touched on 
master anyway. I think this should be relatively clean and 
straightforward, a good use of our new branching/building strategy.

This seems more reasonable to me and like it's standard Git practice.



  reply	other threads:[~2023-07-05 15:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-19 18:25 Branch (and team?) for mesa updates John Kehayias
2023-07-02 10:30 ` Andreas Enge
2023-07-05 15:47   ` Katherine Cox-Buday [this message]
2023-07-05 18:08     ` Andreas Enge
2023-07-05 20:12       ` John Kehayias
  -- strict thread matches above, loose matches on Subject: below --
2023-06-29 16:12 John Kehayias
2023-07-31  1:50 ` Maxim Cournoyer
2023-08-26  0:50   ` John Kehayias
2023-08-26 19:52     ` Maxim Cournoyer
2023-08-27  4:45     ` dan
2023-09-07 18:45       ` Tobias Platen
2023-06-30 15:56 John Kehayias

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='u8439q$69v$1@ciao.gmane.io' \
    --to=cox.katherine.e@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.