Hi, On Wed, 2007-08-22 at 17:51 -0500, Carsten Neumann wrote: > Hi, > > I've been asked to consider moving features/fixes from the > fcptr_stable_jun07 branch to trunk. > However, I'm not sure how to get this done nor whether it is the right > point in time for this move.
Hmm, I probably would wait until the change to store ref pointers internally is done because this will be the point where most people on the stable branch can consider switching back to head. Or is there any pressing need to merge the stable branch stuff right now ?? > In hindsight the main problem seems to be that some bug fixes went into > trunk and some into the stable branch and maybe even some into both. So > as sort of a reminder to self: next time we have the situation of having > two branches, we should state very prominently what type of change is > allowed to go into which branch and speak up if someone gets it wrong. well the stable branch was mainly that people could continue working while Dirk and myself trashed the HEAD. There wasn't any specific agreement on what should go where. Except that we should not trash the stable branch too ;-) > Anyway, now that we have this IMHO somewhat messy situation It's not really messy (it's thirty something commits). Some of which are new stuff (PerfMon) which should easily go over. As to how I would do the merge. Retrieve the patches and merge them in by hand. For some I would even just use trac to check the diff and apply things manually. kind regards, gerrit ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Opensg-core mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/opensg-core
