[Pkg-giraffe-discuss] Z-push: Q about bug fix

[Carsten Schoenert]

Hi,

Am 07.02.2018 um 13:32 schrieb Guido Günther:
>>> That will make merging in debian/experimental harder since git notices
>>> that the changes are alread in. You can work around this with a fake
>>> merge though.
>>
>> How about this:
>>
>> I revert all the commits done for 2.4.0-beta1. Then I import the updated
>> 2.3.8 source on debian/sid and fix the bug there. From that release, we
>> branch d/experimental. We leave it at that for now. 2.4.0-beta2 can then be
>> imported on experimental without any merge problems.
> 
> Then you would lose the nice history between ~beta1 and ~beta2 but
> that's o.k. You can also create a
> 
>     debian/2.3.8.x
> 
> branch where you maintain this version and leave everything else as is.

that's why I was thinking about creating the branch debian/experimental
right from the current tagged version 2.4.0beta and doing then the reverts.

I guess the small needed fake merging is currently easily doable as
there isn't any heavy adjustments in the packaging parts between both
branches happen and we finally want the changes from debian/experimental
and could afterwards simply cherry-picking the small changes from
debian/sid. We would need a versioned dependency on kopanocore 8.5.0 anyway.

The version to be imported isn't a real problem now since upstream has
created a new straight forward version 2.3.9.

-- 
Regards
Carsten Schoenert