Le 29 mars 2012 09:55, Viktor Tarasov <viktor.tara...@gmail.com> a écrit : > Hello, > > On Wed, Mar 28, 2012 at 11:05 PM, Ludovic Rousseau > <ludovic.rouss...@gmail.com> wrote: >> >> Gerrit has more than 200 patches still waiting the the backlog. >> Many of them can't be merge since they do not 'fast-forward' and must >> be rebased by hand. >> >> Since the git commits were created without a Change-Id: we have 3 >> options (I think): >> 1. edit each commit message to add the missing Change-Id: >> and resubmit a rebased patch >> 2. reject all the patches >> rebase all the patches >> resubmit them as new gerrit entries >> 3. reject all the patches >> ask for new submission >> > > 4. Big part of the patches in backlog comes from SM branch. This branch was > recently merged with the public 'staging'. > So, my proposition is to: > 4a. cherry-pick proposals from 'your staging' that are not related to SM and > not yet present in 'public staging' ; > 4b. switch the 'public staging' to 'SM' and use it as a principal > development base and base for releases; > 4c. reset official gerrit to the 'staging' at this moment; > 4d. re-submit previously cherry-picked proposals.
Peter, I do not want to play with the gerrit configuration to remove the fast-forward requirement. I do not want to break something. Viktor, your proposal is work to do for someone. I do not volunteer. I tried to merge the changes from github and gerrit by rebasing github/staging on gerrit/staging. Many patches failed and I rejected them. I committed 5 of them after some rework. No one volunteered to help. As I wrote in my initial email, I now do plan for option 3. Dear contributors, please rebase your changes against the current gerrit/staging branch. Regards, -- Dr. Ludovic Rousseau _______________________________________________ opensc-devel mailing list opensc-devel@lists.opensc-project.org http://www.opensc-project.org/mailman/listinfo/opensc-devel
