On 5/25/2012 6:04 AM, Martin Paljak wrote: > Hello, > > On Wed, May 2, 2012 at 5:31 PM, Douglas E. Engert<deeng...@anl.gov> wrote: >> The SM branch has pulled in many other changes (including >> my C_Derive changes) that I would like to see in the next release. >> If the SM branch is not going to be the bases for the next release, >> then we need to look at what change in the SM branch can be pulled in >> to the release. >> >> Martin, I would like to hear your comments. > > Obviously Viktor and others have had way more time in their hands to > work on OpenSC than me :) > > Also obvious is that the most active branch is supposed to be merged > as the basis for next release, which was more or less the idea of Git > in the first place. > > As the recovery option, the sync problem between Gerrit and github > needs to be cleared. Too much integration is probably not a good idea, > two-way syncing between github pull request and Gerrit has brought no > obvious benefits... > > The most straightforward approach would probably be forcing the github > tree into opensc-project.org and clearing Gerrit... > > Martin
Sounds reasonable, but how do we avoid these types of problems in the future? No two-way syncing, with Gerrit or GitHub as the master? > > -- Douglas E. Engert <deeng...@anl.gov> Argonne National Laboratory 9700 South Cass Avenue Argonne, Illinois 60439 (630) 252-5444 _______________________________________________ opensc-devel mailing list opensc-devel@lists.opensc-project.org http://www.opensc-project.org/mailman/listinfo/opensc-devel
