On Friday 24 Nov 2006 10:27, Guillaume Laurent wrote: > On Sunday 12 November 2006 12:58, Chris Cannam wrote: > > On Sunday 12 Nov 2006 10:38, Guillaume Laurent wrote: > > > Anything preventing us from merging the reorg branch back to the > > > trunk ? > > > > Yeah -- it isn't tested and has no build system. > > It has one now, hasn't it ?
Yes, and it seems we're happy enough with the build system and haven't found too many new bugs. I think it is about time to merge it. I think we need to start by merging from trunk -> reorg the handful of fixes (a couple from Heikki spring to mind) and additional library files that were committed on trunk after reorg was branched, and then just svn mv the trunk out of the way and replace it with the reorg branch (rather than attempting to svn merge back). Does that make sense? I won't be doing it today -- if you have time, I think you should go ahead. Chris ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Rosegarden-devel mailing list [email protected] - use the link below to unsubscribe https://lists.sourceforge.net/lists/listinfo/rosegarden-devel
