mailRe: Managing the 'test_suite' branch.


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by Gary S. Thompson on November 02, 2006 - 12:07:
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...

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 ...


--
-------------------------------------------------------------------
Dr Gary Thompson
Astbury Centre for Structural Molecular Biology,
University of Leeds, Astbury Building,
Leeds, LS2 9JT, West-Yorkshire, UK             Tel. +44-113-3433024
email: garyt@xxxxxxxxxxxxxxx                   Fax  +44-113-2331407
-------------------------------------------------------------------





Related Messages


Powered by MHonArc, Updated Thu Nov 02 13:40:16 2006