maria-developers team mailing list archive

[Alexander Barkov <bar@xxxxxxxxxxx>]

Hi Sergei,


On 12/19/2016 08:29 PM, Sergei Golubchik wrote:
> Hi, Alexander!
> 
> On Dec 19, Alexander Barkov wrote:
>>
>> I created a new branch bb-10.2-ext.
>>
>> So the tentative data flow looks like this:
>>
>> 10.2---------->10.3 <---(once)
>>  \             ^          ^
>>   \            |          |
>>    \- bb-10.2-ext ---> bb-10.2-compatibility
>>
>>
>>
>> - 10.2 will be periodically merged to 10.3.
>> - bb-10.2-ext will be periodically rebased on top of 10.2
>> - bb-10.2-compatibility will be periodically rebased on top of  bb-10.2-ext.
>> - bb-10.2-ext will be periodically merged to 10.3
> 
> No, please, never do that. You cannot have "bb-10.2-ext will be
> periodically rebased" and "bb-10.2-ext will be periodically merged to
> 10.3" both at the same time. If you've merged some commit into 10.3, you
> cannot rebase it anymore.
> 
> You can either "periodically rebase bb-10.2-ext on 10.2" or
> "periodically merge bb-10.2-ext in 10.3"
> 
> I suggest the former.

Right, as Sergey Pertrunya explained, this will generate duplicate
commits in 10.3 for everything in bb-10.2-ext. I didn't know about this.


So the only way to do it correctly is to merge from 10.2 to bb-10.2-ext.

Let's describe it again:


10.2---------->10.3 <---(once)
 \             ^          ^
  \            |          |
   \- bb-10.2-ext ---> bb-10.2-compatibility


1. 10.2 will be periodically merged to 10.3.
2. 10.2 will be periodically merged to bb-10.2-ext
3. bb-10.2-ext will be periodically merged to 10.3

4. bb-10.2-compatibility will be periodically rebased on top of
bb-10.2-ext.
5. bb-10.2-compatibility will once merged to 10.3

To save some duplicate merge work: whenever we do #2
we also do #3.

Does it sound correct now?

Thanks!

> 
>> - bb-10.2-compatibility will once (when it's ready) be
>>   merged or rebased to 10.3
>>
> Regards,
> Sergei
> Chief Architect MariaDB
> and security@xxxxxxxxxxx
>