/hg/icedtea6: 2 new changesets

[Andrew John Hughes]

On 11 March 2010 14:50, Gary Benson <gbenson at redhat.com> wrote:
> Andrew John Hughes wrote:
>> Can you push:
>>
>> > changeset 121319a7f899 in /hg/icedtea6
>> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=121319a7f899
>> > author: Gary Benson <gbenson at redhat.com>
>> > date: Thu Mar 11 12:20:10 2010 +0000
>> >
>> >        Increased ThreadStackSize by 512kb on 32-bit platforms
>>
>> to 1.6 and 1.7 too?  Thanks.
>
> How do I do that?
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

If your current working directory is a checkout of the 1.6
(http://icedtea.classpath.org/hg/release/icedtea6-1.6) or 1.7
(http://icedtea.classpath.org/hg/release/icedtea6-1.6) tree:

$ hg export -R <path to icedtea HEAD checkout> 121319a7f899 > /tmp/patch.diff
$ <edit the patch so that the ChangeLog diff uses the first three
lines of the current ChangeLog in the branch rather than the one in
HEAD>
$ hg import /tmp/patch.diff

It could be much simpler if we didn't have a manual ChangeLog.  For my
own projects, I've found a rule like:

if MERCURIAL_CHECKOUT
${abs_top_srcdir}/ChangeLog: ${abs_top_srcdir}/.hg/dirstate
        (cd ${abs_top_srcdir} && \
         ${HG} log --template='Revision:
$(MERCURIAL_URL)/rev/{node|short}\n{desc}\n\n' > ChangeLog)
endif

works fine and actually gives a better ChangeLog e.g.

Revision: http://icedtea.classpath.org/hg/icedtea6/rev/373dcdea5871
Backport fix for Sun bug 6822370.

2010-03-10  Andrew John Hughes  <ahughes at redhat.com>

	    * Makefile.am:
	    Add new patch.
	    * patches/openjdk/6822370-reentrantreadwritelock.patch:
	    Backported patch from HotSpot 16 to fix bug S6822370;
	    threads blocked when the ReentrantReadWriteLock is

With patches not including the ChangeLog, as with OpenJDK, hg export
<changeset id> | hg import - works fine.
-- 
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