jdk/jdk repository transitions to Git, GitHub and Skara: September 5
thomas.stuefe at gmail.com
Thu Aug 27 15:43:40 UTC 2020
On Thu, Aug 27, 2020 at 11:13 AM Erik Helin <erik.helin at oracle.com> wrote:
> On 8/27/20 10:24 AM, Thomas Stüfe wrote:
> > Hi Erik,
> Hi Thomas, hope you are doing well!
Why thank you, I hope you guys do too :)
> On 8/27/20 10:24 AM, Thomas Stüfe wrote:
> > Will jdk/sandbox be affected or will that continue to work after the
> > transition (and continue being synced with jdk/jdk)?
> The Mercurial repositories jdk/sandbox  and jdk/jdk  will both
> become read-only on Sep 4. There is already a read-only Git mirror for
> the Mercurial jdk/sandbox repository available at:
> This Git mirror is currently read-only, but on Sep 5 it will become
> read-write (and will no longer be a mirror). All JDK Committers and
> above  will be given direct write access to the Git jdk-sandbox
> repository  on Sep 5. We won't give you direct write access prior to
> Sep 5 as it might interfere with the mirroring. Note that you will not
> be given direct write access to the jdk Git repository , instead you
> will use so-called "pull requests" for contributing changes to the jdk
> Git repository. See the "Workflow" section on the Skara wiki for more
> details .
> And yes, we will continue to automatically sync the master branch of the
> Git jdk repository  to the master branch of the Git jdk-sandbox
> repository .
> If you have any more questions, just let me know!
My current work involves working in a named branch at jdk/submit, roughly
following this flow:
- committing my changes locally, rather fine grained into my own branch
- from time to time pushing up to the central hg sandbox repo
- from time to time pulling in new changes and merging from the default
- from time to time creating diffs for reviews
I am currently trying to figure out how this approach will change with git
and github. I know there are subtle differences in the branching concept
between hg and git. I found
which is a good explanation, if somewhat short. Also good and short is
https://github.com/sympy/sympy/wiki/Git-hg-rosetta-stone. However, many
things are still vague and I guess this will only clear up once I switch.
- You write committers have write access to jdk/sandbox, so I can continue
to push my changes in my branch up into the central repository, yes? Will
the default branch be protected against accidental pushes, like I believe
we did for the hg sandbox?
- In mercurial I can filter for changes local to my branch via -b (hg log
-b <branch name>). Is this possible in git too, since there, a branch AFAIU
is only a pointer to a single commit?
I am sure more questions will come once the switch is reality...
Thanks a lot!
> : https://hg.openjdk.java.net/jdk/sandbox
> : https://hg.openjdk.java.net/jdk/jdk
> : https://openjdk.java.net/census#jdk
> : https://git.openjdk.java.net/jdk
> : https://git.openjdk.java.net/jdk-sandbox
> : https://wiki.openjdk.java.net/display/skara#Skara-Workflow
> > Thanks, Thomas
> > On Wed, Aug 12, 2020 at 8:57 AM Erik Helin <erik.helin at oracle.com
> > <mailto:erik.helin at oracle.com>> wrote:
> > Hi all,
> > We are now getting closer to the jdk/jdk repository 
> > transitioning to
> > Git, GitHub and Skara. JEP 357  and JEP 369  were targeted to
> > 16 at the end of May 2020 . It was then also communicated that the
> > jdk/jdk repository would transition "early September 2020" .
> > The exact target date for the transition of the jdk/jdk repository is
> > now set to Saturday September 5, 2020. We aim to complete the
> > transition
> > during the weekend of September 5 - 6, 2020. Starting from September
> > the Mercurial repository for jdk/jdk  will become read-only and
> > Git repository for jdk/jdk  will become read-write on Monday
> > September 7.
> > If you are an OpenJDK Author, Committer or Reviewer, then please make
> > sure you that you are ready for the transition by following the
> > "Getting
> > Started" guide on the Skara wiki . In particular, make sure that
> > associate your GitHub username and OpenJDK username, see the "Getting
> > Started" guide for details. Feel free to try out the new tools and
> > sure that everything works in the OpenJDK playground repository .
> > For those of you doing backports to jdk-updates repositories there
> is a
> > Skara CLI tool, git hg-export, that will export commits from an
> > Git repository in a format expected by hg and the OpenJDK Mercurial
> > repositories . A "clean" backport of a Git commit looks like the
> > following:
> > $ git clone https://git.openjdk.java.net/jdk
> > $ git -C jdk hg-export <REV> | hg -R /path/to/hg/repo import
> > As part of transitioning the jdk/jdk repository we will also
> > the jdk/client repository . There is work ongoing that might
> > in jdk/client being archived instead of transitioned, but that work
> > not guaranteed to be done by September 5. We will send out more
> > on this as we get closer.
> > The jdk/submit  repository will not be transitioned, the
> > functionality is provided by the /test pull request command .
> > There are continuously updated read-only mirrors of the jdk/jdk ,
> > jdk/client  and jdk/sandbox  repositories available if you
> > to create personal forks ahead of the transition. Note that the
> > jdk/jdk15  repository will stay on Mercurial as well as the
> > jdk-updates/jdk15u  repository (at least for the time being).
> > If you have any questions just send an email to
> > skara-dev at openjdk.java.net <mailto:skara-dev at openjdk.java.net>!
> > Thanks,
> > Erik and Robin
> > : https://hg.openjdk.java.net/jdk/jdk
> > : https://openjdk.java.net/jeps/357
> > : https://openjdk.java.net/jeps/369
> > :
> > https://mail.openjdk.java.net/pipermail/jdk-dev/2020-May/004335.html
> > :
> > https://mail.openjdk.java.net/pipermail/jdk-dev/2020-May/004322.html
> > : https://github.com/openjdk/jdk
> > : https://hg.openjdk.java.net/jdk/client
> > :
> > : https://github.com/openjdk/playground
> > : https://wiki.openjdk.java.net/display/SKARA/git-hg-export
> > : https://hg.openjdk.java.net/jdk/submit
> > :
> > : https://github.com/jdk/client
> > : https://github.com/jdk/jdk-sandbox
> > : https://hg.openjdk.java.net/jdk/jdk15
> > : https://hg.openjdk.java.net/jdk-updates/jdk15u
More information about the jdk-dev