<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<br>
> - rewrite older commits as those turned out to be too rough for
publication, which somewhat nullifies the benefits of merge vs
rebase.<br>
<div><br>
Unless you plan to also squash old commits into a single one, I
don't get what you are saying here. And if you do plan to squash
it, then you are losing history, which for a shared branch like
this doesn't seem like a good idea. If you really do want to start
with a clean history, then you might at least consider keeping a
backup branch with the existing commits.<br>
<br>
-- Kevin<br>
<br>
<br>
</div>
<div class="moz-cite-prefix">On 3/20/2023 6:11 AM, Kevin Rushforth
wrote:<br>
</div>
<blockquote type="cite" cite="mid:c8aa78fe-4d1c-32e8-e4cb-aae4d58f9f0f@oracle.com">
jdk:master <i>is</i> JDK 21, so I don't understand what you mean.<br>
<br>
-- Kevin<br>
<br>
<br>
<div class="moz-cite-prefix">On 3/20/2023 6:07 AM, Maxim Kartashev
wrote:<br>
</div>
<blockquote type="cite" cite="mid:CAG0Tb0iHFJGCVmXoCgqScKpeJAT0eE45SXrqvKqw-JtJhcTVKA@mail.gmail.com">
<div dir="ltr">
<div dir="ltr">> Unless there is a strong need for a
rebase, I recommend doing a merge <br>
from jdk:master rather than a rebase.</div>
<div dir="ltr"><br>
</div>
<div>That's understandable in general, but in this particular
case we would like to</div>
<div>- rebase on top of OpenJDK 21, not master,</div>
<div>- rewrite older commits as those turned out to be too
rough for publication, which somewhat nullifies the benefits
of merge vs rebase.</div>
<div><br>
</div>
<div>Neither of those things is absolutely necessary. We can
also have another branch for active development and leave
pure_wl_toolkit for periodic synchronization, which, judging
from experience, will significantly lag.<br>
</div>
<br>
<div class="gmail_quote">
<div dir="ltr" class="gmail_attr">On Mon, Mar 20, 2023 at
4:54 PM Kevin Rushforth <<a href="mailto:kevin.rushforth@oracle.com" moz-do-not-send="true" class="moz-txt-link-freetext">kevin.rushforth@oracle.com</a>>
wrote:<br>
</div>
<blockquote class="gmail_quote" style="margin:0px 0px 0px
0.8ex;border-left:1px solid
rgb(204,204,204);padding-left:1ex">Unless there is a
strong need for a rebase, I recommend doing a merge <br>
from jdk:master rather than a rebase.<br>
<br>
-- Kevin<br>
<br>
<br>
On 3/20/2023 1:18 AM, Maxim Kartashev wrote:<br>
> To whom it may concern:<br>
> In a week or so we would like to rebase the Wakefield
project <br>
> development branch (pure_wl_toolkit, [1]) on top of
OpenJDK 21 and <br>
> clean up Wakefield-related commits history. That will
be a breaking <br>
> change in the sense that you won't be able to simply
fast-forward your <br>
> changes on top of pure_wl_toolkit after that and will
have to do a <br>
> manual merge.<br>
><br>
> If this action somehow affects your work, please
reply to this email <br>
> so we can work out a solution.<br>
><br>
> Thank you,<br>
><br>
> Maxim.<br>
><br>
> [1] <a href="https://urldefense.com/v3/__https://github.com/openjdk/wakefield/tree/pure_wl_toolkit__;!!ACWV5N9M2RV99hQ!PXAvbjuMXhgerh2lrjOlx15tVWzB8jTeZFd3eCksrFTJdeUz87a3wqNP3xEOpOlP3zhl2pyASmSRXVV0xI1XYnjE5kDib6uqZA$" rel="noreferrer" target="_blank" moz-do-not-send="true">https://github.com/openjdk/wakefield/tree/pure_wl_toolkit</a><br>
<br>
</blockquote>
</div>
</div>
</blockquote>
<br>
</blockquote>
<br>
</body>
</html>