@Oliver, I will not do any any cherry-picks because I have write access to the repo. If you will look at the current branch tree you will see that every new release branch bases on previous release branch. And master branch is a sandbox. It contains some commits which are too risky to be included into release. Also if you will take a look at any release banch you will see that all commits were integrated there separately one by one. I think it is the best way to continue this work. In any case, as I said previously, cherry-picking is the better way to integrate needed commits only. And my job now is to create a list of commits which should be included into release with the links to the corresponded issues (of course, it's only my opinion). Onlce I'll finish my job I'll sent the list of commits for discussing. If you think this is a wrong way to do this please suggest your own. I think David will be happy if you will suggest smth easier.
Thanks Best regards, Vitalii Koshura 2017-03-29 13:08 GMT+03:00 Oliver Bock <oliver.b...@aei.mpg.de>: > On 29/03/2017 10:33 , Vitalii Koshura wrote: > > @Oliver, I want to build a list of recommended commits to be > > integrated into release branch. > > The list of 'fresh' commits (after > > 6.6.33) will be very short (less than 100 commits). Also I want to > > see older commits which were not released for some reasons (maybe > > some of them were just missed) and give them a chance to be reviewed > > one more time. > > Hm, I don't think I understand what you're trying to achieve. Let me > start with what you wrote earlier: > > > 1 - create new release branch 'client_release/7/7.7' based on > > 'client_release/7/7.6' > > 2 - merge necessary commits using 'cherry-pick' from master branch. > > Why would you do that? What's the point of basing 7.7 on 7.6? Also, > cherry-picking commits is error-prone for the purpose you outlined. > > Given that BOINC currently uses master to integrate changes one should > branch off master when it's time to constitute a new release series, > like 7.7. Such a branch can then be used to build releases which will be > tagged individually (7.7.2). The branch will only receive bug fixes > afterwards, cherry-picked from master. > > Given that there is no client_release/7/7.7 branch yet, I strongly > recommend to use the commit David based his latest client release on > (presumably 967fa51c). That commit should also get the > client_release/7.7/7.7.2 tag. Based on that the 7.7 branch can then be > used for further maintenance and bug fix releases while further > development happens in master, until it's time for 7.8 to branched off > master. > > > Cheers, > Oliver > _______________________________________________ boinc_dev mailing list boinc_dev@ssl.berkeley.edu https://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
