classpath-0.95 merge

Fri May 11 10:29:00 GMT 2007

Andrew Haley schrieb:
> Matthias Klose writes:
> >
> > - I didn't update classes found in libjava, which were updated in
> > classpath/libjava except the necessary bits to make the merge build again.
>> We really need to know what classes these were. I've been quite
> careful to copy all from changes to libjava to classpath upstream.

$ svn status classpath | grep '\.java$' | sed 's,[^/]*classpath/,,' | while read
f; do [ -f $f ] && echo $f; done
gnu/java/nio/SelectorProviderImpl.java
java/lang/String.java
java/lang/System.java
java/lang/Class.java
java/lang/Character.java
java/text/DateFormatSymbols.java
java/text/Collator.java
java/text/DecimalFormatSymbols.java
java/net/MulticastSocket.java
java/net/NetworkInterface.java
java/io/File.java
java/util/Currency.java
java/util/Calendar.java
java/util/logging/LogManager.java
java/util/logging/Logger.java
attached a diff for these files; at least for Class.java, it appears that the
changes were not merged for the last import.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merged.diff
URL: <http://gcc.gnu.org/pipermail/java/attachments/20070511/b9223d52/attachment.ksh>