[Kroupware] Re: [PATCH] Fixes Bug 49802: vcard does not get displayed, kmail shows error instead

[Don Sanders]

On Thursday 28 November 2002 23:37, Marc Mutz wrote:
> On Thursday 28 November 2002 14:08, Don Sanders wrote:
> <snip>
>
> > I'm ok with postponing the discussion for the moment. But I think
> > this move should be made well before 3.2. I'm willing to start
> > the migration by moving KMail Cool and its dependencies into
> > kdepim. I would like to do this once Kontact/Kaplan and its
> > components are ready for distribution.
>
> <snip>
>
> Grmpf. You're again trying to run away from the work and
> responsibility of merging. Sorry, but I doubt it will work like
> that.
>
> You can see how we are merging kroupware->HEAD piece by piece,
> independent change by independent change. I expect the make_it_cool
> merge to happen the same way. And if you are not willing to split
> up the changes, I guess there will be people (incl. me) taking over
> extracting what we want to have in HEAD and porting it back piece
> by piece.
>
> We all know that a large merge done in one go introduces no end of
> problems. We saw that with Aegypten; we certainly don't want to see
> it with kroupware and make_it_cool.

Except for some rejects the changes in HEAD have already been merged 
into make_it_cool piece by piece.

If there are specific unintegrated changes you would like to discuss 
please detail them.

Don Sanders / sanders@kde.org
KMail  Adopter / kmail.kde.org
KDE PIM  Co-founder / kdepim.org
KAddressbook  Founder / kaddressbook.org
KDE  Contributor / kde.org