Nir Soffer <nsoffer@redhat.com> writes:

> On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
>
>> Dan Kenigsberg <danken@redhat.com> writes:
>>
>> > On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com>
>> wrote:
>> >
>> >> Hi,
>> >>
>> >> I created ovirt-4.3 branch.  That means patches for 4.3 must be
>> >> backported from master since now.
>> >>
>> >> Not everything regarding CI is ready yet, but until we make the branch,
>> >> we can't make some things working nor prove they are working.  We need
>> >> the branch to move forward.
>> >>
>> >> *Please don't merge non-4.3 patches to master yet.*
>>
>
> Do we plan to rebase on master after initial testing?

No.  I'm going to merge 4.3 backports quickly during the testing phase
and to make the testing phase as short as possible.

>> >> Let's make 4.3 backports completely safe and trivial for a while, until
>> >> we have working CI on 4.3.
>> >>
>> >> I'm not particularly happy with the branching process, let's use this
>> >> experience to improve it next time.  At minimum some guidelines should
>> >> exist rather than just "common knowledge" with missing bits and pieces.
>> >>
>> >
>> > One of the "common knowledge" items is that immediately after you merge a
>> > post-branchout patch to master, you should tag it (with v4.40).
>>
>> Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new
>> master with.
>>