harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: [classlib] Merge of trunk to java6 branch
Date Tue, 26 Jan 2010 22:31:43 GMT

In message <201001262220.o0QMKJZQ013189@d12av01.megacenter.de.ibm.com>,
Mark Hindess writes:
> 
> In message <a43fbc6a1001261346j4889c679m37665761f9a8b77b@mail.gmail.com>,
> Jesse Wilson writes:
> >
> > On Tue, Jan 26, 2010 at 5:28 AM, Mark Hindess
> > <mark.hindess@googlemail.com>wrote:
> > >
> > > I've just done a merge of the classlib trunk@901560 to the java6
> > > branch.  There were quite a few conflicts this time around in
> > > particular with TreeMap, TreeSet, and Properties so if you committed
> > > changes to these classes since the last merge you might want to
> > > sanity check that I merged your changes correctly.
> > 
> > From my quick read through, you got TreeSet right, but lost change
> > 888668<http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules
> /luni/src/main/java/java/util/TreeMap.java?r1=824002&r2=888668>
> > in
> > TreeMap.
> 
> Jesse,
> 
> Fixed in r903454.  Thanks for sanity checking this for me.  Much
> appreciated.

Interesting.  I've revert this change temporarily as it breaks a number
of tests.

-Mark.



Mime
View raw message