harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jesse Wilson <jessewil...@google.com>
Subject Re: [classlib] Merge of trunk to java6 branch
Date Tue, 26 Jan 2010 21:46:53 GMT
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.

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message