RFR: 8078193: BACKOUT: Rename and clean up the ParGCAllocBuffer class

Thomas Schatzl thomas.schatzl at oracle.com
Tue Apr 21 12:51:03 UTC 2015


Hi,

On Tue, 2015-04-21 at 10:09 +0200, Bengt Rutisson wrote:
> Hi Kim,
> 
> On 2015-04-21 00:14, Kim Barrett wrote:
> > Please review this change to back out a changeset.
> >
> > The intended fix for JDK-8074546 was pushed with a commit message
> > containing the wrong bug id. To simplify tracking the changeset
> > through repository promotions to release, we're going to hg backout
> > the problem changeset and re-push with a corrected commit message.
> >
> > The hg backout applied cleanly:
> > Changeset: hs-gc/hotspot: 8148:dafb0a98e749
> >
> > CR:
> > https://bugs.openjdk.java.net/browse/JDK-8078193
> >
> > Webrev:
> > http://cr.openjdk.java.net/~kbarrett/8078193/webrev.00/
> >
> > Testing:
> > JPRT
> 
> 
> Doing hg backout does not apply cleanly for me.
> 
> $ hg backout -r 8148
[...]
> merging src/share/vm/runtime/globals.hpp
> merging src/share/vm/runtime/globals.hpp failed!
> 142 files updated, 0 files merged, 1 files removed, 1 files unresolved
> use 'hg resolve' to retry unresolved file merges

Backout works here.

> There is a conflict in globals.hpp. But the patch file provided in the 
> webrev:
> http://cr.openjdk.java.net/~kbarrett/8078193/webrev.00/hotspot.changeset
> 
> applies cleanly for me and does the right thing to globals.hpp.
> 
> So, I think the webrev looks fine. Reviewed.

Think so too. Please push this backout and the good change at the same
time as Bengt suggested.

Thanks,
  Thomas




More information about the hotspot-gc-dev mailing list