28.01.2015 13:21, Robert Jonsson wrote: > Hello again, > > 2015-01-28 9:31 GMT+01:00 Andrew Deryabin <[email protected]>: >> Hi guys! >> >> 28.01.2015 12:19, Robert Jonsson wrote: >>> Hi guys, >>> >>> >>> 2015-01-27 22:04 GMT+01:00 Tim E. Real <[email protected]>: >>>> On January 27, 2015 10:03:39 PM Andrew Deryabin wrote: >>>>> Hi Tim! >>>>> >>>>> The evening, and at last put my hands on persistent_ports branch. >>>>> >>>>> Quick report: It works!!! >>> Awesome! >>> Haven't had time to test it yet but I'll hopefully get there sooner >>> rather than later. >>> >>> <...> >>>>> P.S. I also successfully merged persistent_ports branch to my qt5 branch >>>>> without any conflict at all! So, my last question is still alive :) >>>> Ah yes. So I should continue to develop in my branch? >>>> Correct? >>> My opinion is that you can stay in your branch but we do this: >>> 1. Andrew pushes some fixes back to main >>> 2. We release that as 2.2.1 >>> 3. push Qt5 to main >>> 4. And before you make any major changes, Tim, make a pull from main >>> and commit that to your branch. This to limit future conflicts. >>> >>> How's that? >> Excellent! I've just backported styles fix and some lv2 optimizations to >> master (excluding lv2 presets save/restore as it will lead to lots of other >> dependences). >> If Tim agree, now is the right time to make a 2.2.1 tag and merge qt5 to >> master. >> >> I also think, that we should merge Tim's changes to master too. Persistent >> ports functionality works very well and is ready for master (It's a session >> manager inside MusE!). It will also help to develop new dialogs directly in >> qt5 and not to port them later. > I agree that the gui fixes should be done when Qt5 is there but this > could still be in Tims branch. > > If Tim's changes already work quite well I suppose I have nothing > against merging back to master. I did get the feeling there were still > a lot to do, adding ALSA support, and not the least clean ups? > I guess it's a question of timeframe whether we update his branch with > Qt5, or if we merge everything back to master. > > I think Tim can make the call if he wants to push to master or pull > from master, in the short run. Well, I will not argue. Let's make your plan, Robert. My changes are ready for 2.2.1. > > Regards, > Robert
-- Regards, Andrew ------------------------------------------------------------------------------ Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Lmuse-developer mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lmuse-developer
