[Kde-pim] How to backport?

[Rafael Fernández López]

Hi,

> I just fixed bug #169662 in trunk, but I don't know how to backport the fix
> to 4.1. Are there any how-to's explaining this?
> And how can I test the fix with the stable branch in an easy way
> (preferably without checking out and compiling the whole KDE 4.1 branch)?

You have to checkout 4.1 branch first:

svn-ssh://svn.kde.org/home/kde/branches/KDE/4.1/module

where module would be kdepim (or kdepimlibs, haven't seen the commit) in this 
case.

You need to get the diff. Do it before committing to trunk by a regular:

svn diff > ~/patch.diff 

or do it after committing, by a regular:

svn diff rev1:rev2 > ~/patch.diff

Now move to your 4.1 checkout, and do a regular

svn up
patch -p0 < ~/patch.diff
svn ci

With a message starting by "Backporting commit ######.", and a small 
explanation.

If there are more sophisticated ways (a mars civilian or a magic script that 
does it, I don't know, I always do this :P).


Regards,
Rafael Fernández López.
-------------- 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/20080826/69f0e920/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/