Howto switch local repo from icedtea to openjdk?

[Andrew John Hughes]

On 30 December 2009 13:52, Clemens Eisserer <linuxhippy at gmail.com> wrote:
> Hi,
>
> Some time ago I rebased the xrender pipeline on icedtea,
> because the OpenJDK repo didn't have some patches to make it build at
> that time. (arround jdk7m5)
>
> I tried to go back to the offcial OpenJDK repos, in order to make it
> easier getting the code upstream.
> Simply changing the repo-url didn't work as expected
> from: http://hg.openjdk.java.net/icedtea/jdk7/jdk/
> to: http://hg.openjdk.java.net/jdk7/jdk7/jdk/
>

Well there are seven of them altogether, jdk is just one.

> however executing:
> hg pull
> hg update
> hg merge
>
> Results in tons of files, which require manual merge.
>
> Is there an easy way to go back to openjdk repos,
> or do I have to manually merge all my stuff into a fresh local repo
> again (guess this is the 5-7x I am doing this)?
>

There shouldn't be that many differences between JDK7 and the IcedTea
forest, but there are some.  I'm going to start listing them here:

http://icedtea.classpath.org/wiki/IcedTea7_Forest_Patches

The idea is to migrate the patches from the IcedTea repositories
(where they have to be applied by every user) to being applied against
the upstream forest once and once only.
The IcedTea forest also tends to include security fixes earlier than upstream.

I would say the easiest way to switch back is to checkout jdk7, then
hg export -R <path to old repo> <changeset id> | hg import - each of
your changesets in your new checkout.

Is your tree public?

> Thank you in advance, Clemens
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8