What actually happened is that the *master* branch (with new, less tested
code) was accidentally merged into the *release* branch (older, more stable
code). These changes went into the invalid 4.2.4 release.

Note that we are now using GitHub's protected branch feature to minimise
the chances of this happening again!

To fix the *release* branch, we would have to revert 400+ commits, or
rewrite the history of the branch (eg git reset to commit 73b1dd29), both
unpleasant options with side effects. Then we would have to cherry-pick
various fixes into *release* again, fix merge conflicts and do a fair bit
of testing. This would also mean that Zanata 4.2.5 would have some older
code in it (missing bug-fixes and features) compared to the invalid release
4.2.4.

The release testing for Zanata 4.3 is starting soon anyway, so we've
decided instead to declare the *release* branch (and Zanata 4.2.5) a lost
cause.


*If you're running Zanata 4.2.1*, hang on, Zanata 4.3 should be along soon.

*If you're running Zanata 4.2.4*, you're really running a pre-release
version of Zanata 4.3.0, so you might want to downgrade to 4.2.1 for now.

*If you're working on Zanata's codebase*, please don't work from the
*release* branch until we have branched for 4.3, probably later this week.
Until then, you should probably work with the *master* branch. If you
*really* need to do maintenance work on 4.2, please talk to us on the
zanata-devel mailing list and we'll try to help.

Regards,

Sean.


On 11 September 2017 at 10:32, Ding Yi Chen <dc...@redhat.com> wrote:

> Hi,
>
> We are sorry to announce that, due to our process error, platform-4.2.4 is
> invalid.
>
> We are aware of the issue and are working to fix it as soon as possible.
> In the meantime, please downgrade to 4.2.1.
>
> Regards,
>
> --
> Ding-Yi CHEN
>
> Software Engineer, Globalization Group
> Red Hat Asia-Pacific Pty Ltd
> dc...@redhat.com
> Twitter: @redhatway | Instagram: @redhatinc | Snapchat: @redhatsnaps
>
> _______________________________________________
> zanata-devel mailing list
> zanata-de...@redhat.com
> https://www.redhat.com/mailman/listinfo/zanata-devel
>



-- 
Sean Flanigan

Principal Software Engineer
Globalisation Tools Engineering
Red Hat
_______________________________________________
zanata-users mailing list
zanata-users@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-users

Reply via email to