On 11/2/06, Gary S. Thompson <garyt@xxxxxxxxxxxxxxx> wrote:
Edward d'Auvergne wrote:
>
> Make sure that your commit contains solely the bug fix (commit early
> and often is the open source way). Then just merge it normally into
> 1.3 and 1.2 with 'svn merge'.
there is a problem here. when i commited Revision: 2723 it included
both merges and the corrections to float.py and test-float.py to correct
bugs. thus i propose to copy the changes to copy the changes to float.py
to the 1.2 and 1.3 branch and manually commit them with relevant
comments. the other alternative would be to revert these two files in
the test-suite branch ton their 1.3/1.2 form and then reapply the
changes an create two commits. now i think about this this seems better
what do you think...
The standard way would be to revert the change and then apply them
separately. Then the revision with the fix can be picked up as a
single unit and ported to the main lines. Didn't r2723
(https://mail.gna.org/public/relax-commits/2006-11/msg00018.html) just
consist of three merges from the 1.2 line??
Edward
regards
gary
nb if you note a lack of capitals and brackets here i seem to have lost
shift and caps lock fuctions on my keyboard at the moment ...
I could imagine that that would cause problems :)
Re: Managing the 'test_suite' branch.