At 03:38 AM 10/30/2004, Markus Schöpflin wrote:
That's exactly why I was proposing that the changes should go the other way round, not from main to RC but from RC to main as the danger is quite high that you merge something to RC that you didn't want to merge.
We used to do it the way you suggest. We have had far less problems since we changed to the current procedures. IIRC, part of the problem with going from RC to main was that if that when the merge step got forgotten, there was often a considerable time delay before anyone realized there was a problem. That made it more difficult to figure out what was wrong. OTOH, if a merge from main to RC is forgotten then it is detected quickly because there are a lot of eyes looking at the RC and RC tests. Since the change is fresh in the developer's mind, the developer usually knows instantly what happened and can fix it quickly. --Beman