RFR: 8078193: BACKOUT: Rename and clean up the ParGCAllocBuffer class
bengt.rutisson at oracle.com
Tue Apr 21 08:09:35 UTC 2015
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
Doing hg backout does not apply cleanly for me.
$ hg backout -r 8148
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
There is a conflict in globals.hpp. But the patch file provided in the
applies cleanly for me and does the right thing to globals.hpp.
So, I think the webrev looks fine. Reviewed.
Will you push the fix for "Rename and clean up the ParGCAllocBuffer
class" with the correct bug number at the same time? Would be nice to
minimize the window where the repo is in an intermediate state.
More information about the hotspot-gc-dev