As discussed in the call, I want to release this fix for bug#954143 and
bug#1002417. It's all about correct handling of rpm files with sw_single
in KDE. XFCE is not affected and I assume GNOME neither.

It's relatively important for Leap 42.2, which is in beta phase so
moderately open to changes.

On the other hand, is not that relevant for SP2 which is in RC phase,
meaning that only really critical stuff should get in.

In our SLE-12-SP2 branch we have yast2-packager 3.1.117

In the master branch we already have yast2-packager 3.1.118 (btw, when
will we jump to 3.2.x?)

In the past we used to have a merge_after_SP2_release branch that we
used to accumulate fixes that we wanted to release as maintenance update
the same day of the release.

Where should my fix go and how should it be versioned?

I can create the merge_after_SP2_release branch and submit stuff from
there to Leap 42.2. But there is a problem. In order to submit the stuff
I have to put a version number to it. Assuming it would be 3.1.117.1.
What happens if we need to fix a critical issue in the SLE-12-SP2
branch? We have no version number to do that (317.X would already be
taken for the merge_after_SP2_release branch and 318 is already in master).

My suggestion, start using 3.2.X for master. We can correct the already
released packages not using that versioning schema. They shouldn't be many.

So the solution would look like this(for the yast2-packager example)

SLE-12-SP2 (SP2 in OBS) -> 3.1.118, 3.1.119...
master (TW in OBS) -> 3.2.1, 3.2.2...
merge_after_release (Leap and SP2:Update) -> 3.1.117.1, 3.1.117.2...

Changes introduced in SLE-12-SP2 should also be merged in
merge_after_release (producing a new number there) and the final merge
after release should bump the number to follow the SLE-12-SP2 series.

What do you think?

I would like to discuss this in tomorrow's call to unblock the situation.
-- 
Ancor González Sosa
YaST Team at SUSE Linux GmbH
-- 
To unsubscribe, e-mail: [email protected]
To contact the owner, e-mail: [email protected]

Reply via email to