On Thu, Nov 11, 2010 at 07:51:55PM +0100, Jan Holesovsky wrote:
Either we can merge the entire libreoffice-3-3 there, or we can merge
just ooo/OOO330_m14, and continue cherry picking between master and
libreoffice-3-3.
+1 for merging libreoffice-3-3
branch to master. OTOH - if we disable/revert something on the branch,
we will most probably revert it (by the merge) in the master too.
Well, assuming the reasons for the revert still holds true on master...
And anyway, this shouldn't happen that much on a stable branch, should there? :)
Even with this risk, merging from libreoffice-3-3 to master is my
preferred choice, I am more afraid of forgetting something (happens so
often!), than of accidentally disabling something. Also, when we start
merging more regularly, we can do the fixes that should appear in both
branches in libreoffice-3-3 only, and they will be merged anyway.
ACK.
Grüße/Regards,
René
Context
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.