[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    Re: Integrated subset of make_it_cool
From:       Ingo =?iso-8859-1?q?Kl=F6cker?= <kloecker () kde ! org>
Date:       2002-12-26 12:16:27
[Download RAW message or body]

On Thursday 26 December 2002 09:32, don@sanders.org wrote:
> I've integrated a subset of the make_it_cool changes into HEAD.

[snip]

> I did try to break the changes up into smaller diffs, but because the
> changes include rewrites of major subsections of the code, and
> subsequent fixes over a period of several months that was not
> feasible, basically this is my best effort at integration.

Don? If the TT mail server has problems and you therefore can't follow 
our discussions on kmail@kde.org (especially the discussion between 
Marc and Zack who talked about how _they_ want to do the merge) then 
you should have read kmail@kde.org through news.uslinuxtraining.com 
(cf. www.kde.org/mailinglists.html). Marc and Zack spent a lot of time 
creating hundreds of small diffs. And as it seems you just tried it for 
a few hours, gave up and then waited 24 hours for a reply to a message 
which stayed 31 hours on TT's mail server:

Received: from lupinella.troll.no (80.232.37.59)  by 
kde.informatik.uni-kl.de
 with SMTP; Wed, 25 Dec 2002 14:12:08 +0000
Received: from lupinella.troll.no
 ([80.232.37.59]:55942 "EHLO        heather.trolltech.com.au" ident:
 "NO-IDENT-SERVICE[2]")        by trolltech.com with ESMTP id
 <S298070AbSLXHKx>; Tue, 24 Dec 2002 08:10:53 +0100

Furthermore yesterday was Christmas, I celebrated with my family and 
didn't read any mail. So I couldn't even have replied if the message 
hadn't been stuck somewhere for more than a day.

Nobody expected you to do any merging. It's nice that you tried to help 
but I'm not sure whether your help (i.e. the huge commit) wasn't 
counterproductive. You basically stabbed Zack and Marc in the back and 
made all their work more or less obsolete (well, anyone who is 
interested in all the small changes can have a look at the patches they 
created. But it would have been much better if this would have been 
documented inside CVS.)

If Zack _and_ Marc ask me to revert HEAD again then I will do so. Not 
because I don't appreciate your help. But because I think the merge can 
be done in a more transparent way.

You could concentrate on integrating some of the kroupware changes into 
make_it_cool. But please don't step on Marc's and Zack's feet again in 
the next few days. Simply sit back, relax and watch Zack and Marc do 
all the hard work which is very much appreciated by me.

Regards,
Ingo


[Attachment #3 (application/pgp-signature)]
_______________________________________________
KMail Developers mailing list
kmail@mail.kde.org
http://mail.kde.org/mailman/listinfo/kmail

[prev in list] [next in list] [prev in thread] [next in thread]