rr...@free-radical:~/Code/mixxx-trunk$ bzr diff | wc 164537 736958 5986394 rr...@free-radical:~/Code/mixxx-trunk$ bzr commit -m "Merging lp:mixxx/1.7 into lp:mixxx"
I've done the dirty deed! I merged the latest SVN commits into lp:mixxx and then merged from the 1.7 branch. I compiled it and everything seems to work as expected. There were minor issues. The Mixxx.nsi scripts have severely diverged and I don't feel qualified to work out the differences. On top of all that, Mixxx.nsi in SVN was moved to mixxx/build/nsis/Mixxx.nsi, while the 1.7 version remained in mixxx/Mixxx.nsi. I just left both of them in trunk and kept the sconscript code for using the mixxx/Mixxx.nsi one since that has the most recent that was used for packaging 1.7.0. Otherwise, the merging went very smoothly. Going forward, if you develop a feature, base your feature branch on lp:mixxx and pull the changes from it frequently so you stay up to date. When you are ready for your feature to be reviewed and merged into trunk, propose it for merging on launchpad, or alternatively send a merge-directive to mixxx-devel (you can make one with `bzr send'). All features must be done in branches, and won't be merged into trunk until they are *ready to ship*. Cheers on the release guys, let's get cracking on 1.8! -RJ ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
