Hello, 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 I did option 1 for some patches. It is very borring and time consuming. Without help (man power) I do plan for option 3. I do not know if a creating a french OpenSC association to deal with the project governance will help here. But people with some free time can surely help move OpenSC. The process is simple. Select a patch and go to its "oldest" unmerged ancestor. Then do: # a. create a merge branch git branch merge # b. go inside local merge branch git checkout merge # c. get cherry-pick a patch from gerrit git fetch ... # d. add Change-Id: git rebase -i HEAD~1 # e. push git push gerrit HEAD:refs/for/staging # f. go inside staging git checkout staging # g. resync git pull The real command for step c. is given at the gerrit interface for a given patch. Example with https://www.opensc-project.org/codereview/#/c/45/ The command is "git fetch https://www.opensc-project.org/codereview/p/OpenSC refs/changes/45/45/1 && git cherry-pick FETCH_HEAD" In step d. the missing Change-Id: line must be added in the commit message. In the "git rebase" in interactive mode replace "pick" by "reword" Then add the Change-Id: given by gerrit. In this case "Change-Id: Ifc3b467d8a299897bb7417c8dfd09873f24e46f6" as the last line of the commit message. You can loop on steps c, d, e, c, d, e, ... Any volunteer? -- Dr. Ludovic Rousseau _______________________________________________ opensc-devel mailing list opensc-devel@lists.opensc-project.org http://www.opensc-project.org/mailman/listinfo/opensc-devel
