8155224: Bring back version control history to g1Policy.hpp and g1DefaultPolicy.*

Stefan Johansson stefan.johansson at oracle.com
Wed Apr 27 11:41:33 UTC 2016


Hi Erik,

On 2016-04-27 13:32, Erik Helin wrote:
> Hi all,
>
> this a rather strange patch :)
>
> When I made the commit for JDK-8154753 "Turn G1Policy into an
> interface" [0], I used `hg mv --after` to record that the file
> g1DefaultPolicy.cpp originated from g1Policy.cpp (and for .hpp files as
> well). However, this did not seem to preserve the history, since `hg log
> --follow g1DefaultPolicy.cpp` does not show the changes that were made
> to g1Policy.cpp.
>
> To fix this, I updated my the hotspot repository to the parent of
> ce2108 and re-created the change. However, this time I used `hg mv` and
> `hg cp` when moving the files (thanks Mikael for the tip). I then merge
> the new head with the tip of jdk9/hs/hotspot (a benign merge since the
> content of the files are identical). Now, the history is "back" (it was
> never lost, it just wasn't possible to conveniently  view it with `hg
> log --follow`).
>
> So, please re-review this identical change for JDK-8154753. webrev can't
> tell that I used different hg commands, so the webrev will look
> identical.
>
> Bug:
> https://bugs.openjdk.java.net/browse/JDK-8155224
>
> Webrev:
> http://cr.openjdk.java.net/~ehelin/8155224/webrev.00/
Look good,

StefanJ
> Thanks,
> Erik
>
> 0: http://hg.openjdk.java.net/jdk9/hs/hotspot/rev/ce2108f27dcb



More information about the hotspot-gc-dev mailing list