Re: [equinox-dev] Incorrect merge of osgiR8 branch into master for rt.eq

["Thomas Watson" <tjwatson@xxxxxxxxxx>]

I decided to just live with the painful history of reverting the merge commit instead of force pushing to rewind history.  Master is back to where it should be and back open for development.  I needed to do this before the I-Build kicked off today and didn't want to risk waiting for the foundation to do the force push to master for me.

 

Sorry for the bone-headed move on my part.

Tom
 

 

 

----- Original message -----
From: Thomas Watson/Austin/IBM
To: equinox-dev@xxxxxxxxxxx, platform-releng-dev@xxxxxxxxxxx
Cc:
Subject: Incorrect merge of osgiR8 branch into master for rt.equinox.framework
Date: Tue, Mar 10, 2020 3:35 PM
 

I incorrectly merged into master a long running branch I have for OSGi R8 development in the rt.equinox.framework.  I have a bug opened against the foundation asking to get a force push to master to correct things:  https://bugs.eclipse.org/bugs/show_bug.cgi?id=560997

 

As much as I dislike a force push to rewind histroy, in this case I think it is warranted because the OSGi R8 branch has loads of merge commits and it was then itself merged into master.  There is not a simple revert operation here to get master back to where it should be.  As of now consider master closed for rt.equinox.framework until this is sorted out.

Tom