[Kde-pim] PROPOSAL: Moving the KDEPIM Enterprise Branch into the 3.5 Branch

[Till Adam]

On Thursday 11 October 2007 21:35:16 Ingo Klöcker wrote:
> On Thursday 11 October 2007, Till Adam wrote:
> > On Thursday 11 October 2007 15:39:56 Allen Winter wrote:
> > > On Wednesday 10 October 2007 7:08:54 pm David Faure wrote:
> > > > On Thursday 11 October 2007, Allen Winter wrote:
> > > > > Does it make sense/Is it plausible to effectively eliminate
> > > > > the enterprise/kdepim branch by moving it into
> > > > > branches/KDE/3.5?
> > > >
> > > > Are we sure that 3.5 has no fixes that didn't go into enterprise?
> > > > AFAIK my colleagues have set up svnmerge and kept an eye on
> > > > changes, but still it might be a good idea to make sure we're not
> > > > overwriting a bugfix.
> > >
> > > KDAB would have to provide an answer for this.
> > > I have no idea.
> >
> > Yes we are reasonably sure of that, but will definitely inspect
> > the diff before any merge back, to make sure.
> 
> I did a very brief check and looked at a few random files which differ. 
> Just a few things I've spotted:
> - aboutdata.cpp enterprise points to the obsolete kmail.kde.org
> - callback.cpp enterprise seems to be missing the "Exchange compatible 
> invitations" fix
> - folderstorage.cpp 3.5 contains some code for "folder close tracking".
> ...

As I said, we'll check the diff, and we don't intend to replace 
3.5 with enterprise, but merge.

Till

-- 
Till Adam -- till at kdab.net, adam at kde.org
KDAB, Platform-independent software solutions
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20071012/f8b89019/attachment.sig>
-------------- next part --------------
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/