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.
