Thiago Macieira schrieb: > Actually, 4.0 is closed for development and 4.1 will close very soon (when > 4.2 > is released). The only chances of those moving again are security fixes.
But if SVN is read-only you can't apply fixes there, and you *have* to keep 4.0, 4.1 alive in git, and merge 4.0->4.1->4.2->master occasionally. My point was that in order to do the very first 4.0->4.1 merge after the conversion to git, you need to have the merge-base of 4.0 and 4.1 in the history, which is the revision where 4.0 was forked off. > As for 3.5, at this point in time, it can be considered a completely > different > codebase, so anything there can't be merged into 4.2. So it would be either a > patch or a manual change. Fair enough. 3.5 *is* a completely different beast. -- Hannes _______________________________________________ Kde-scm-interest mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-scm-interest
