Re: classpath-0.95 merge

[Matthias Klose <doko at ubuntu dot com>]

Andrew Haley schrieb:
> Matthias Klose writes:
>  > 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.
> 
> I don't understand what you're showing me.  This is the difference
> between gcj HEAD and what?

these are the changes made in classpath between the last and the current import
for all files where we have a modified copy directly in libjava.