From: Daniel W. <dan...@gm...> - 2010-06-04 21:26:28
|
Dominque, You may run into quite a few conflicts when you try and merge your new-setup branch back to trunk. If the bug fixes are being duplicated you will have some reconciling to do. Ideally, you'd make the bug fix on trunk and then merge trunk to your new-setup branch keeping a record in the logs of the revision numbers. To merge new-setup back in to trunk you would first merge trunk to new-setup and reconcile and then merge back the other way. Anyway, we are quite careful about this type of thing in fipy, see <http://matforge.org/fipy/browser/trunk/documentation/ADMINISTRATA.txt>. We may want to implement a similar policy for pysparse or add this ADMINISTRATA file with suitable modifications. Cheers. On Fri, Jun 4, 2010 at 11:06 AM, Dominique Orban <dom...@gm...> wrote: > On Fri, Jun 4, 2010 at 3:37 PM, Daniel Wheeler > <dan...@gm...> wrote: >> 2010/6/4 Dominique Orban <dom...@gm...>: >> >>> Daniel, should we be thinking about making new-setup the default in >>> Pysparse? That is the one using the "standard" distutils layout and is >>> the one in the Python Package Index. Have you tried it with FiPy? >> >> Net yet. I'll try it with fipy and then you can merge it back into >> trunk. I'm going to make a release from the version 1_1_x branch >> anyway (not from trunk) with the minor bug fixes we've been making so >> this is irrelevant right now. Once you are happy with your merge we >> can do a version 1.2 release from trunk. Does that sound reasonable? > > Sounds good. I'll wait for your comments on using the new-setup branch > with Fipy. There will be some namespace adjustments required. Of > course, the namespace can be adjusted too. > > -- > Dominique > -- Daniel Wheeler |