How to import patch from jdk/jdk

[Laurent Bourgès]

Thanks you all for your suggestions,
I will practice first with my simple patch on the png image writer (9 ->
8), then try backporting the long patch queue for the Marlin renderer (9,
10, 12, 14 -> 8)...

Cheers,
Laurent

Le mer. 21 août 2019 à 18:12, Roman Kennke <rkennke at redhat.com> a écrit :

> > On 12/08/2019 09:05, Severin Gehwolf wrote:
> >> Hi,
> >>
> >> On Sat, 2019-08-10 at 16:58 +0200, Laurent Bourgès wrote:
> >>> Ok,
> >>> I will use sed on the patch file to fix paths, then I will import it. I
> >>> thought such sed script already exist or mercurial or linux patch
> command
> >>> already manage that.
> >>
> >> You could try common/bin/unshuffle_patch.sh from JDK 9[1].
> >>
> >> Thanks,
> >> Severin
> >>
> >> [1]
> http://hg.openjdk.java.net/jdk-updates/jdk9u/file/1b1226687b89/common/bin/unshuffle_patch.sh
> >>
> >
> > If the patch was committed to jdk/jdk or jdk-updates/jdk11 (as opposed
> > to being an older jdk9 patch), it usually needs both the jdk11 script
> > [0] (to move the files back into their subrepos, jdk11->jdk9) and the
> > jdk9 script [1] (to get rid of the modules, jdk9->jdk8). Both scripts
> > need data files from the same directory, so checking out the repos is
> > probably the easiest option.
> >
> > All this file movement is a major PITA.
> >
> > [0]
> >
> https://hg.openjdk.java.net/jdk-updates/jdk11u/file/tip/bin/unshuffle_patch.sh
> > [1]
> >
> https://hg.openjdk.java.net/jdk-updates/jdk9u/file/tip/common/bin/unshuffle_patch.sh
> >
>
> It looks like it should be possible to use this in conjunction with hg
> transplant --filter to transplant patches between versions.
>
> https://www.mercurial-scm.org/wiki/TransplantExtension
>
> Roman
>
>