Re: [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
On Wed, Dec 07, 2011 at 11:46:41AM +, Caolán McNamara wrote: On Wed, 2011-12-07 at 10:53 +, Michael Meeks wrote: + tripple cross-company code review for features until nearer RC1 + exceptions: artwork, unit-tests until RC1 FWIW, I don't personally feel that triple reviews have to require cross-company reviewers, just that when we're in a require review phase that if all reviewers happen to be from the same organization then that review happen on-list. I suppose you are not the only one who feels that :) This exception is exclusively for features added after the feature freeze, not regular bugfixes. D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
Petr Mladek schrieb: Hi all, as promised, we have created a branch for the stabilization of the 3.5.x releases, called 'libreoffice-3-5'. It is based on master, last pull on December 6, 2011 at about 13pm UTC. See also the tag libreoffice-3-5-branch-point. Hello, I am a little concerned what happened with fixes between branch and today. I believe most of later fixes will be cherry picked to 3.5Beta, but may be we have to check that additionally for fixes of the last days? Bugs https://bugs.freedesktop.org/buglist.cgi?chfield=resolutionchfieldfrom=2011-12-05chfieldto=2011-12-13chfieldvalue=FIXEDlist_id=24678product=LibreOfficequery_format=advancedorder=changeddate%2Cbug_id%20DESCquery_based_on= with fixes from 2011-12-05 to 2011-12-05 might be affected. Petr, what are the facts? CU Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
Rainer Bielefeld píše v Po 12. 12. 2011 v 13:52 +0100: Petr Mladek schrieb: Hi all, as promised, we have created a branch for the stabilization of the 3.5.x releases, called 'libreoffice-3-5'. It is based on master, last pull on December 6, 2011 at about 13pm UTC. See also the tag libreoffice-3-5-branch-point. Hello, I am a little concerned what happened with fixes between branch and today. I believe most of later fixes will be cherry picked to 3.5Beta, but may be we have to check that additionally for fixes of the last days? Bugs https://bugs.freedesktop.org/buglist.cgi?chfield=resolutionchfieldfrom=2011-12-05chfieldto=2011-12-13chfieldvalue=FIXEDlist_id=24678product=LibreOfficequery_format=advancedorder=changeddate%2Cbug_id%20DESCquery_based_on= with fixes from 2011-12-05 to 2011-12-05 might be affected. Every developer who fix a bug is responsible for pushing the fix into all appropriate branches (master, libreoffice-3-5, or even older branches). We do not do any regular merges between branches. Also we do not have any dedicated person who would take care of this. The idea is that people are responsible. Authors of fixes know most details about them. They could best decide how the fix is important, dangerous, and where it is needed. If they are unsure, they could always ask for review and opinion from other developers on irc or the mailing list. Of course, people do mistakes. They might underestimate the importance or just forgot to push a fix. In this case, I expect that the reporter will complain that a fix is still missing. We have many betas, release candidates, and bug fix releases, so there are many possibilities to add the fix later. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
Rainer Bielefeld píše v Po 12. 12. 2011 v 13:52 +0100: Petr Mladek schrieb: Hi all, as promised, we have created a branch for the stabilization of the 3.5.x releases, called 'libreoffice-3-5'. It is based on master, last pull on December 6, 2011 at about 13pm UTC. See also the tag libreoffice-3-5-branch-point. Hello, I am a little concerned what happened with fixes between branch and today. I believe most of later fixes will be cherry picked to 3.5Beta, but may be we have to check that additionally for fixes of the last days? Bugs https://bugs.freedesktop.org/buglist.cgi?chfield=resolutionchfieldfrom=2011-12-05chfieldto=2011-12-13chfieldvalue=FIXEDlist_id=24678product=LibreOfficequery_format=advancedorder=changeddate%2Cbug_id%20DESCquery_based_on= with fixes from 2011-12-05 to 2011-12-05 might be affected. Every developer who fix a bug is responsible for pushing the fix into all appropriate branches (master, libreoffice-3-5, or even older branches). We do not do any regular merges between branches. Also we do not have any dedicated person who would take care of this. The idea is that people are responsible. Authors of fixes know most details about them. They could best decide how the fix is important, dangerous, and where it is needed. If they are unsure, they could always ask for review and opinion from other developers on irc or the mailing list. Of course, people do mistakes. They might underestimate the importance or just forgot to push a fix. In this case, I expect that the reporter will complain that a fix is still missing. We have many betas, release candidates, and bug fix releases, so there are many possibilities to add the fix later. Best Regards, Petr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
On Tue, 2011-12-06 at 14:26 +0100, Petr Mladek wrote: + only bugfixes are allowed + no approval needed during beta phase until Jan 9, 2012 So - there are a few other exceptions to the 'only bug-fixes' that the TSC agreed: + tripple cross-company code review for features until nearer RC1 + exceptions: artwork, unit-tests until RC1 Was the minute: so - if you want to add sexy new stuff - unit tests are still open until RC1, and artwork fixes as well. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
On Wed, 2011-12-07 at 10:53 +, Michael Meeks wrote: + tripple cross-company code review for features until nearer RC1 + exceptions: artwork, unit-tests until RC1 FWIW, I don't personally feel that triple reviews have to require cross-company reviewers, just that when we're in a require review phase that if all reviewers happen to be from the same organization then that review happen on-list. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [ANNOUNCE] Branch libreoffice-3-5 created
Hi all, as promised, we have created a branch for the stabilization of the 3.5.x releases, called 'libreoffice-3-5'. It is based on master, last pull on December 6, 2011 at about 13pm UTC. See also the tag libreoffice-3-5-branch-point. The following rules apply: + only bugfixes are allowed + no approval needed during beta phase until Jan 9, 2012 + 1 approval needed during rc phase and upcoming bug fix releases + 2 approvals with different/no affiliation needed for late features IMPORTANT: Every developer is responsible for pushing fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable 3.5 release. Do not forget to push useful fixes to this branch. git cherry-pick commit-id is your friend :-) The 'master' branch is used for 3.6 development and has the rules: + free commit; do your best to do not break build and functionality + any development allowed For further information about the roadmap, please check http://wiki.documentfoundation.org/ReleasePlan Now, if you want to switch your clone to the libreoffice-3-5 branch, do: ./g pull -r ./g checkout -b libreoffice-3-5 origin/libreoffice-3-5 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; ie. libreoffice-3-5 when you have switched to it. This will save you some git shouting at you. Happy hacking, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
