[U-Boot-Custodians] Branches other than "master" ?

[Alexey Brodkin]

Hi Tom, all,

> -----Original Message-----
> From: U-Boot-Custodians <u-boot-custodians-bounces at lists.denx.de> On Behalf Of Neil Armstrong
> Sent: Wednesday, August 28, 2019 11:00 AM
> To: u-boot-custodians at lists.denx.de
> Subject: Re: [U-Boot-Custodians] Branches other than "master" ?
> 
> On 27/08/2019 17:39, Tom Rini wrote:
> > Hey all,
> >
> > While thinking about making use of the "next" branch of the main tree
> > more often, and perhaps similar to how linux-next is used, I was looking
> > at http://www.denx.de/wiki/U-Boot/CustodianGitTrees again.  This talks
> > about both "next" and "testing" branches.  Does anyone make use of
> > "next" or "testing" branches today?  If so, are they rebased, or not?  I
> > want to make sure that if I make any changes to a top-level branch name
> > policy it's consistent throughout and won't cause problems.  Thanks!

I use "next" branch occasionally to stage commits that missed
current/last merge window.

And there might be some value in having automatically merged
common "next" tree similar to linux-next. But IMHO it will only
be useful past merge-window as otherwise in U-Boot being much
smaller code-base compared to Linux patches get merged pretty
fast (kudos to Tom and other custodians) so we have then manually
merged master :)

That said I'd prefer to have a common "next" branch where I'll
be able to dump my patches and forget about sending pull-requests
right after the next release (which I often do, I mean forget to
send staged patches right after release). But that will obviously
add some work for Tom to fix conflicts on merging a lot of changes
from "next" to current "master".

-Alexey