Thanks for the explanation Tomas. Regards, - Graeme -
On 9/5/06, Tomas Hajny <[EMAIL PROTECTED]> wrote:
> If I create a bug fix, should I create a patch file against 2.1.1 or > 2.0.x ? What is preferred? First of all, 2.0.x is supposed to serve as fixes branch, so most functional enhancements (especially major ones) are _not_ supposed to be applied there. When talking about fixes, we normally use the Python svnmerge script (search in Wiki for details) to merge the original patch to 2.0.x. If there are conflicts during the merge operation, they may need to be handled manually. However, in most cases the fact that conflicts exist may stem from two things:
_______________________________________________ fpc-devel maillist - [email protected] http://lists.freepascal.org/mailman/listinfo/fpc-devel
