On Sunday, 26 November 2006 16:36, Guillaume Laurent wrote: > 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.
There still was one fix remaining in trunk. I think that now everything is OK. > > 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. I think it is really possible. Using Subclipse (the Subversion plugin for Eclipse) ... 1. Open the "SVN Repository Exploring" perspective 2. Select the repository URL (https://svn.sourceforge.net/svnroot/rosegarden) 3. Expand the tree 4. Select "trunk" folder and press the secondary mouse button to open the contextual menu. 5. There is a "rename/move..." menu item available, which opens a wizard... I propose: a) move "trunk" to "branches/oldtrunk-before-reorg" b) move "branches/reorganisation" to "trunk" Regards, Pedro ------------------------------------------------------------------------- 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
