[Kde-pim] KDEPIM trunk still frozen

[Volker Krause]

On Friday 15 January 2010 17:54:51 Volker Krause wrote:
> On Thursday 07 January 2010 18:36:24 Thomas McGuire wrote:
> > this is just an announcement that KDEPIM trunk is still frozen for new
> > features. Please wait with committing new features until the
> > akonadi-ports branch will get merged back to trunk, which is expected to
> > happen next week.
> >
> > The freeze helps us with the merging: To merge back the akonadi-ports
> > branch to trunk, we first have to merge all commits from trunk to
> > akonadi-ports. And if people start committing new features, we would be
> > fighting windmills and never be in sync.
> >
> > Thanks to Volker for always handling the merges to and from the
> > akonadi-ports branch.
> >
> > I'll do a bunch of merges from the enterprise4 branch to trunk now, and
> > then merge them myself to akonadi-ports, to have e4 in sync with trunk
> > and akonadi- ports again.
> >
> > Non Kontact applications like ktimetracker of kalarm are of course not
> > affected.
> >
> > I'm looking forward to reintegrating the akonadi-ports branch to trunk,
> > that will save us from a lot of this merging trouble.
>
> ok, here is a little status update of the merge:
> - kdepimlibs is done, there are a few remaining differences which need
> closer inspection, but nothing critical, most importantly kdepimlibs in
> both branches is now in sync regarding the API, so trunk kdepimlibs can be
> used to build a-p kdepim
> - all known app/runtime dependency issues in kdepim have been resolved
> - the kmail migrator has been completed up to the point where no data
> should be lost anymore (metadata and settings can still get lost, big
> warnings will prevent you from accidentally starting it) and has been
> integrated into kmail - kdepim is merged expect:
>  - kmail, kontact kmail plugin, bpf plugins: still pending trunk -> a-p
> merges which block the merge, I simply can't keep up with e4 and Laurent ;)

done

> - korganizer and related changes in libkdepim and kontact, no kown blockers

done

> - akregator/krss: I'll leave that to Frank as this also has pending trunk
> -> a-p merge

will stay in a-p for a while, as requested by Frank

>  - kjots (and related payload type changes in the kolab resource), requires
> a final decision by Steve, it's straightforward to merge and has no known
> blockers

still pending

> So, what does that mean:
> - unless you are committing to korg/kmail/akregator/kjots please use trunk,
> for those stay in akonadi-ports until further notice
> - if you commit to korg/kmail/akregator/kjots in trunk nevertheless,
> *please* merge your changes to a-p immediately, every pending change there
> blocks the merge of those back to trunk
> - the merge will not be completed before Monday

from now on please use trunk for all work, unless you are working on akregator 
or kjots, for akregrator please coordinate with Frank, for kjots please stay 
with a-p for another day until we got that one merged as well.

If you think something was lost during the merge please let me know, the whole 
process is not error-free unfortunately.

regards
Volker
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20100118/73207dca/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/