[Patch] the big cleanup merge

Michael Koch konqueror@gmx.de
Thu Feb 17 09:33:00 GMT 2005


On Thu, Feb 17, 2005 at 10:09:09AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Thu, 2005-02-17 at 07:47 -0600, Michael Koch wrote:
> > I just commited this patch to trunk under the "obvious" rule. It merges
> > in all fixes to author tags, html fixes to javadocs, removes some CVS
> > tags and reorders some modifiers.
> 
> Thanks. I see that this patch mixes gui and non-gui stuff.
> Does this mean the gui branch is officially dead now and that we can
> officially merge in bug fixes from GNU Classpath CVS directly into the
> trunk whithout having to go through the gui branch first?

For me it is. I know I'm selfish in this regard. :-)

> BTW. It really helps if you use the exact same ChangeLog message when
> you merge stuff. I can kind of guess which clean-up commits this
> corresponds with on the GNU Classpath side, but I am not sure which of
> the 8 cleanup commits from yesterday this precisely corresponds with. It
> is not a big deal now. But it really helps if there are multiple
> days/weeks/months between the merges.

Normally I do but in this case it doesnt help much. No real code change
happened. And it don't exactly matched the patches for GNU classpath as
some things were already in GCC and some stuff was already in GNU
classpath before.


Michael



More information about the Java-patches mailing list