On 2019-02-13 00:56:49, Apollon Oikonomopoulos wrote: > On 18:38 Tue 12 Feb , Iustin Pop wrote: > > On 2019-02-12 17:02:35, Apollon Oikonomopoulos wrote: > > > Hi everyone, > > > > One specific question below: > > > > > - git push --force origin v2.16.0:master and continue development from > > > there. I don't expect the force-push to be an issue, and it's much > > > cleaner than a `git merge -s ours' or messing up our versioning. We > > > *will* be actually throwing away that development history — at least > > > for the time being. > > > > There are a number of github pull requests against master. They might > > need manual rebase or even re-creation. > > They can be rebased, and those that were already merged can be > cherry-picked to the new master branch. Some of them can even be merged > to stable-2.16 for 2.16.1, since they're addressing long-standing bugs. > > > > > Have you thought of actually just taking master as is, and relabelling > > it as 2.17~pre0 or such? Do you know what's the incomplete work on it? > > The problem with master is that it also contains all stable-2.17 > unreleased work as well.
I see. > To get an idea: > > Commits on stable-2.17 that were not in v2.16.0 > > $ git shortlog -sn --no-merges v2.16.0..origin/stable-2.17 > 126 Klaus Aehlig > 30 Helga Velroyen > 28 Oleg Ponomarev > 17 Bhimanavajjula Aditya > 10 BSRK Aditya > 8 Lisa Velden > 3 Brian Foley > 3 Federico Morg Pareschi > 3 Viktor Bachraty > 1 Daniil Leshchev > 1 Dimitris Bliablias > > From stable-2.17, there's additionally the following commits to reach > master: > > $ git shortlog -sn --no-merges origin/stable-2.17..origin/master > 27 Brian Foley > 21 Oleg Ponomarev > 17 Klaus Aehlig > 14 Iustin Pop > 8 Thomas Vander Stichele > 7 Daniil Leshchev > 7 Federico Morg Pareschi > 7 Yiannis Tsiouris > 5 Calum Calder > 4 Bhimanavajjula Aditya > 4 Hrvoje Ribicic > 4 Lisa Velden > 3 Viktor Bachraty > 2 David Mohr > 1 Alexandros Kosiaris > 1 Arnd Hannemann > 1 Brian Candler > 1 Dimitris Aragiorgis > 1 Emily Bragg > 1 Federico 'Morg' Pareschi > 1 Igor Vuk > 1 Jun Futagawa > 1 Nicolas Avrutin > 1 Nikos Skalkotos > 1 Phil Regnauld > > > The delta from stable-2.17 to master is small, but from 2.16.0 to master > it includes all the stable-2.17 changes. Indeed, that's a large body of untested (as in unreleased, and not run in production) code. > I think it's best to just > cherry-pick individual commits of interest directly from master. I'll be a bit busy then, regarding the few fixes I have in master :) thanks, iustin
