[equinox-dev] Incorrect merge of osgiR8 branch into master for rt.equino

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[equinox-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework

From: "Thomas Watson" <tjwatson@xxxxxxxxxx>
Date: Tue, 10 Mar 2020 20:35:46 +0000
Delivered-to: equinox-dev@xxxxxxxxxxx
Importance: Normal
List-archive: <https://www.eclipse.org/mailman/private/equinox-dev>
List-help: <mailto:equinox-dev-request@eclipse.org?subject=help>
List-subscribe: <https://www.eclipse.org/mailman/listinfo/equinox-dev>, <mailto:equinox-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://www.eclipse.org/mailman/options/equinox-dev>, <mailto:equinox-dev-request@eclipse.org?subject=unsubscribe>
Sensitivity:

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

Prev by Date: [equinox-dev] Master branch is open for 4.16 contributions
Next by Date: Re: [equinox-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework
Previous by thread: [equinox-dev] Master branch is open for 4.16 contributions
Next by thread: Re: [equinox-dev] Incorrect merge of osgiR8 branch into master for rt.equinox.framework
Index(es):
- Date
- Thread

Breadcrumbs