Re: State of the current cvs branches?
Martijn Faassen <[email protected]> Wed, 19 May 2004 07:49:19 +0200
| Newsgroups | gmane.comp.web.zope.formulator.devel |
|---|---|
| Message-ID | <[email protected]> |
Clemens Robbenhaar wrote: > I am currently a little confised aboput the current state for the > different formulator branches. > > On the formulator-general there have been quite a few bug reports and > patches some of them I would like to patch / fix on the current HEAD. > On the other hand there are some larger changes at least on the > "faassen-validation-branch"; e.g. converting the tests to use > ZopeTestCase. Right, that's the endless branch I don't have the time for to get finished. :) > > As there are no "critical" bugs in the list of the pending fixes I > could get fixed I currently stay away from applying the changes to avoid > unnecessary conflicts when merging the current branches. Especially > I woulf like to add test cases to make sure some of the patches really > fix something and this stays fixed. Obviously this will conflict with > the reorganization of the tests on the branch. > However I wonder if or when a merge is actually planned. > So the question is if it is ok to apply any changes to the current HEAD > except those which are really fixing critical stuff. Do apply the fixes to the HEAD. Keep a detailed log in HISTORY of what you fixed and did, so that I can investigate them and port them over to faassen-validation-branch when I get time for it. > Personally I am not in a hurry about the issue, as I will not have the > time to look into the patch-list in the next two weeks anyway. Thanks for looking into these patches! Regards, Martijn