Re: [DISCUSS] Releasable trunk and quality

2022-01-06 Thread Henrik Ingo
On Wed, Jan 5, 2022 at 10:38 PM Mick Semb Wever wrote: > +(?) Is the devil we know >> > > + Bi-directional relationship between patches showing which branches it > was applied to (and how). From the original commit or any of the merge > commits I can see which branches, and where the original co

Re: [DISCUSS] Releasable trunk and quality

2022-01-06 Thread Joshua McKenzie
> > If you see a merge commit in the history, isn't it normal to presume that > it will contain the additional change for that branch for the parent commit > getting merged in? I've been noodling on this a bit; I think it's a question of degree. When I see a merge commit my intuitive expectation i

Re: [DISCUSS] Releasable trunk and quality

2022-01-06 Thread bened...@apache.org
So, one advantage of merge commits is that review of each branch is potentially easier, as the merge commit helps direct the reviewer’s attention. However, in my experience most of the focus during review is to the main branch anyway. Having separate tickets to track backports, and permitting th