[X2Go-Dev] schedule release of X2Go Client 4.0.2.0

[Michael DePaulo]

On Sun, Mar 16, 2014 at 1:24 PM, Mike Gabriel
<mike.gabriel at das-netzwerkteam.de> wrote:
> Hi Michael,
>
> a follow-up thought...
>
> We should not provide 4.0.1.4 for Windows. Only 4.0.2.0.
>
> The reason for the dual upcoming release is that distros that have an old
> libssh have the choice to use a legacy X2Go Client (4.0.1.4) whereas all
> other distros should use the 4.0.2.0 version.
>
> For your commits on Git: don't change anything... (superseding myself in my
> previous mail!!!).

Understood & agreed.

> Mike
>
>
> On  So 16 Mär 2014 18:20:37 CET, Mike Gabriel wrote:
>
>> Hi Michael,
>>
>> On  So 16 Mär 2014 17:16:35 CET, Michael DePaulo wrote:
>>
>>> As I mentioned on IRC, I accidentally applied the commit to the master
>>> branch. Let me know how you want me to proceed.
>>
>>
>> The way to do such a dual branch commit properly is this:
>>
>>   o Checkout the release/4.0.1.x branch
>>   o Fix the code there.
>>   o Add a changelog entry for the upcoming release on that branch
>>     (4.0.1.4).
>>   o Add the "(Fixes: #nnn)." identifier to the changelog entry
>>   o commit everything together on that release branch
>>
>>   o then do a git checkout master
>>   o cherry-pick that special commit from the release/4.0.1.x branch
>>     to the master branch
>>   o if you are lucky (mostly) the commit will apply cleanly to the
>>     code base on the master branch
>>   o if you are unlucky, resolve the conflicts manually (if you need
>>     help on this, we can join up on IRC for a session once that happens)
>>   o the changelog entry should automatically appear in the master
>>     branch's changelog file at the correct position
>>
>>   o push everything to git.x2go.org

Thanks. I'll do this for 448 once I figure out how to fix it and I
write the fix.

>>
>> The way to fix a commit that does not have a "(Fixes: #nnn)." statement:
>>
>>   o revert that commit
>>   o re-cherry-pick the fixing commit
>>   o do a "git reset HEAD~"
>>   o fix-up the changelog
>>   o and re-commit the amended changelog together with the
>>     code fixup

But what do I do if I already pushed it?

>>
>>> Also, since it is a regression, I would like to spend until the end of
>>> Monday (tomorrow) night looking into bug 448 and hopefully fixing it
>>> by then.
>>
>>
>> We should definitely see to that. Thanks for taking over that task. Take
>> more time if needed.
>>
>> Greets,
>> Mike

Thanks. I'll keep you posted via the bugtracker.