On Friday 24 November 2006 11:38, Chris Cannam wrote: > > 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,
This is done, AFAICT - Pedro did most of it and I've just finished committing a couple remaining bits. > 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? That I'm not so sure about. I don't know if svn mv can move branches this way, although reading about branches it seems they are just normal directories, so perhaps yes. -- Guillaume. http://telegraph-road.org ------------------------------------------------------------------------- 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
