From: Carsten N. <car...@gm...> - 2007-08-22 22:46:42
|
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. 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. Anyway, now that we have this IMHO somewhat messy situation, do you have suggestions on how to clean it up and when is trunk in a condition that this makes sense (I'm not asking for a date here, rather for a list of things that should be taken care of before merging changes from stable) ? Also, I'm not looking for a way to offload work here, rather the opposite, I'd very much like to do the merging, I just don't now the best way to do it. Thank you for any suggestions, Carsten |