Re: [patch] monthly java-gui-branch merge

[Mark Wielaard <mark at klomp dot org>]

Hi,

On Fri, 2004-06-18 at 02:02, graydon hoare wrote:
> I just merged and committed the last 22 days' activity in libjava/ 
> (~600k of patches) from java-gui-branch to trunk. the patch is here:
> 
> http://people.redhat.com/graydon/java-gui-merge-june-17-2004.patch

I am merging this into GNU Classpath, but the patch has ChangeLog
entries for things that are not actually in the patch:

2004-06-10  Sascha Brawer  <brawer@dandelis.ch>

        * javax/swing/undo/UndoManager.java: Re-written from scratch.

We don't need this in GNU Classpath of course since it was already in
there from a long time ago. But it was also not in the patch and that
confused me. It seems this was on mainline already.

2004-06-10  Michael Koch  <konqueror@gmx.de>

       * javax/swing/table/DefaultTableCellRenderer.java
       (noFocusBorder): Initialize directly.

This is the exact same change as this "ancient" change on mainline:

2004-04-23  Mark Wielaard  <mark@klomp.org>

        * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Assign
        dir to this.direction.

There are a couple more ChangeLog entries that are not actually in the
patch because they were added to mainline earlier like:

2004-06-10  Michael Koch  <konqueror@gmx.de>

       * javax/swing/table/DefaultTableCellRenderer.java
       (noFocusBorder): Initialize directly.

2004-06-10  Michael Koch  <konqueror@gmx.de>

       * javax/swing/plaf/BorderUIResource.java,
       javax/swing/plaf/ComponentUI.java,
       javax/swing/undo/CompoundEdit.java,
       javax/swing/undo/StateEdit.java:
       Fixed javadocs all over.

Could you please not add ChangeLog entries for changes on the branch
that you don't carry over to mainline. It confused the heck out of me.
The positive effect was that I check about half of the patch to see what
was really going on and I think the changes are basically sane. But I
didn't really enjoy reading so many diffs. Will try to be a little less
paranoid in the future, but having a ChangeLog that actually says
exactly what did change helps with that.

Thanks,

Mark

Attachment: signature.asc
Description: This is a digitally signed message part