2009/8/24 Christian Thalinger <Christian.Thalinger@sun.com>:
Andrew John Hughes wrote:
Btw. what do you think of using Mercurials rebase extension[1]? I think it would be more straight forward as the base repository would be exactly the same (no changesets in between) and the BSD changes on top of it.
This seems to have worked ok in moving the OpenJDK6 HotSpot repository to a common base with the other HotSpot repositories, but I was under the impression that the BSD repo. was already based on JDK7? As Greg mentions, there are regular updates from JDK7 going into BSD.
It's true that it's based on JDK 7, but that doesn't mean we cannot use rebase. The advantage of using rebase is that we would have the BSD changes in a few (or one) changeset. The drawback might be that a particular change in the BSD changeset always fails to merge on a rebase (I had that once with GIT).
-- Christian
True, but I don't see the advantage in destroying the history just to make the changes into a more convenient set of changesets. -- 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