On May 19, 2011, at 9:03 AM, Vincent van Ravesteijn wrote: > On Wed, May 18, 2011 at 10:58 PM, Pavel Sanda <sa...@lyx.org> wrote: > > > > Did I say you need to ask permission ? Did I say you need to wait before > > doing something ? > ... > > You somehow think that you need permission before pushing a feature ? > > one reading of "After that, you and me decide when it merges to trunk-stable" > is like that. its actually connected to the question above and if i get it > completely wrong, then sorry. > > It's not like asking the maintainer for "permission". it's more like "if > there are > no serious comments on a patch, if there are no bugs introduced and if it is > understandable to others", it will automatically get merged into trunk-stable > after some period of testing.
Pavel, all, So far Vincent did not force on you anything and he is adapting his maintainer role to the current conservative developpers. I think it is really time now to let Vincent proceed with his strategy. What Vincent did is to cheery pick the svn commits in svn trunk and reformat them to git topic branches. He also created a "trunk-stable" branch that will eventually becomes 2.1 if his strategy proves to be successful. I am personally very confident that Vincent will succeed and I suggest that we let him a few weeks to prove his case and also that we support him in doing so. If that doesn't work, we can always forget about "trunk-stable" and continue with "development" like now. A - For a supportive developer, supporting Vincent means: 1) developing in git branches 2) merge those branches in development when the supportive developer thinks the feature is mostly implemented 3) tell Vincent when the feature is mostly stable and do not introduce regression; then Vincent will decide to merge the branch or not B - For a supportive but conservative developer that just don't want to use branches: 1) develop locally his feature 2) when the feature is mostly ready, rebase from "development", commit and push to "development". This means that this feature will be available in one big patch with no history. 3) tell Vincent when the feature is mostly stable and do not introduce regression; then Vincent will decide to merge the branch or not C - For the non supportive developer: 1) git commit and push all changes to "development" 2) Vincent (or some helper) will then have to cherry pick those commits and gather them in a branch before merging to trunk-stable Vincent is essentially doing C now with svn-trunk. I suggest that we switch to git and that each developer decided if we want to do A, B or C. I will do A personally but I would understand if people start by doing C, then B, then A. Abdel.
