Howto switch local repo from icedtea to openjdk?

[Clemens Eisserer]

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/

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)?

Thank you in advance, Clemens