On Monday 12 Mar 2007 12:41, Guillaume Laurent wrote: > I'm about to merge this branch back in the trunk.
OK, so what you did was: - merge trunk to branch (instead of the other way around) - realise your error - move trunk out of the way - move branch to trunk That's really bad, it loses all the revision history on trunk since you split off the branch (I don't mean the changes themselves, I mean the metadata). Let me get this straight so we can fix it: - revision 7673 was the initial creation of the branch - revision 7950 was the erroneous merge from trunk to branch: was the entire merge committed in this single revision or do we need to know about any others? - revision 7951 was moving the trunk out of the way - revision 7952 was moving branch to trunk Right? So we need to: - delete (or rename again) the new trunk - move the moved-out-of-the-way trunk back to trunk - merge revisions 7673:7949 of branch to trunk Yes? I don't mind doing this (and testing it builds) myself, but it has to be done. FWIW I didn't test the branch at all prior to the merge, I wasn't aware it was in a testable state. It might have been wise to get some testing. 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
