Nick Guenther wrote: > Okay so lp:mixxx has merged all the few remaining changes that were in > SVN and we can disable svn, but what *is* lp:mixxx? Is it trunk? If > it's trunk, what is lp:mixxx/1.7 (where we've been working)? Are we > going to merge lp:mixxx and lp:mixxx/1.7 at some point?
lp:mixxx is indeed trunk lp:mixxx/1.7 is the 1.7 series bug fix release branch After 1.7.0 gold is released, we will merge changes from the 1.7 branch to trunk, leaving the 1.7 branch to continue to receive bug fixes. (We should have been doing so all along, but anyway...) So perhaps "merge" isn't the right terminology for that operation. Copy-merge? Sean <<--------------------------------------------------------------------------------->> This E-Mail message has been scanned for viruses and cleared by >>SmartMail<< from Smarter Technology, Inc. <<--------------------------------------------------------------------------------->> ------------------------------------------------------------------------------ Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT is a gathering of tech-side developers & brand creativity professionals. Meet the minds behind Google Creative Lab, Visual Complexity, Processing, & iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian Group, R/GA, & Big Spaceship. http://www.creativitycat.com _______________________________________________ Mixxx-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mixxx-devel
