On Thu, 5 Nov 2015 08:36:53 +0100 Ancor Gonzalez Sosa <[email protected]> wrote:
> First day after Leap release, first day after branching SP1... first > doubt. > > We have assumed that the "Leap team" will take care of making sure > that our fixes for SP1 end in 42.1 as well. In that perfect world we > only commit to two branches on the repo (master and SLE-12-SP1). We > submit stuff from master to Factory and SP2:GA and stuff from > SLE-12-SP1 to SP1:GA or SP1:Update. > > But there are corner cases, sometimes we need to fix something that > only affects Leap. The most obvious example is a YaST package that is > only in openSUSE but not in SLE (not 100% of the YaST Leap packages > come from SLE). Like this bug. > https://bugzilla.suse.com/show_bug.cgi?id=952249 > > To me, it looks like we also need an openSUSE-42_1 branch in the > yast-control-center repo and maybe in some others. We can create them > on demand, since there is no automation involved and we probably need > to check from which commit branch in a case by case basis. > > I hope packages coming from TW to be the only corner case for Leap. > For bugs in the SLE-12-SP1 branch that only affects Leap I hope the > SLE (maintenance) staff will allow us to commit the fixes there and > release maintenance updates as long as we don't break SLE in the > process, even if they don't fix any real SLE issue. > > Cheers. I thought that conclusion is to use leap branch only when neeeded. There is more packages needed it like skelcd-control-opensuse or maybe theme. So if we need to diverge, create branch, if not, then use only SLE12-SP1 branch. Maybe I should document it in https://yastgithubio.readthedocs.org/en/latest/maintenance-branches/#maintenance-branch-naming Josef -- To unsubscribe, e-mail: [email protected] To contact the owner, e-mail: [email protected]
