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

List:       kmail-devel
Subject:    Re: Merging.
From:       Marc Mutz <mutz () kde ! org>
Date:       2002-12-20 23:59:49
[Download RAW message or body]

On Friday 20 December 2002 20:49, Zack Rusin wrote:
<snip>
> What I'd
> strongly propose is to merge everything into HEAD. Freaking dump the
> damn branches. And no, we can't break HEAD because it's broken
> already. It's broken so badly that we can't break it any more.
<snip>

You see, this is what you get when one rushes that f*cking merge without 
reason :-((

I see two other options:

1. Rewind to before the last big make_it_cool merge commit (which I 
guess is what broke HEAD?)[1] or
2. Rewind to 3_1_BRANCH

and do it right his time. 

We can probably play back the kroupware_branch merge in a few hours. I'd 
suggest that make_it_cool is broken up into self-contained changes by 
the people who worked on it (as was kroupware_branch) and then merged.

Ultimately it's Ingo's decision, but you know I'm strongly in favour of 
clam merging instead of dumping.

You will say that this takes too long, but, you see, it already _has_ 
taken too long and sometimes you need to take a few steps back to 
restart from a known-good basis.

Marc

[1] I'm quite a bit disappointed that the commit was known to break 
basic functionality soon after it was executed, but was not reverted 
nor fixed by the committer. The more so as that person is now RD for 
KDE 3.2 and should really know better. :-(

-- 
It's good fortune for the government that the masses don't think.
                                                         -- Adolf Hitler

[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]