Brett Porter wrote, On 11/22/2005 9:07 PM:

- use of the flying fish technique (ie bugfix only release goes over to /branches/2.0.x)
  * we should merge at each point release (2.0.1, 2.0.2) back to trunk
  * can do interim merges if there are long time lines on those releases


It has always been my experience that merges back to th trunk should be done immediately, by the original patch author, while it is still fresh in one's mind. The problem of merging back to the trunk at the point release becomes even worse when code has been modified in the trunk.



Regards,
Alan



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to