On Oct 31, 2012, at 16:39 , Benoit Chesneau <[email protected]> wrote:
> On Wed, Oct 31, 2012 at 4:27 PM, Jan Lehnardt <[email protected]> wrote: > >> >> On Oct 31, 2012, at 16:23 , Paul Davis <[email protected]> >> wrote: >> >>> On Wed, Oct 31, 2012 at 11:18 AM, Adam Kocoloski <[email protected]> >> wrote: >>>> No objection from me, Jan. I don't see the need for a dedicated >> "develop" branch at the moment, but then I've not worked intensively on a >> project which had one. >>>> >>>> Adam >>> >>> I think the intention there is if you have a sufficiently large test >>> suite that accurately represents reality. Thus when you're landing >>> features in quick succession you have a place to test the combination >>> before they "go live". I'm not sure we really have that (also >>> considering that we run our test suite locally and don't rely on a >>> central CI server). >> >> Good summary! >> >> I think we want to be working towards that, but yeah, we are not >> really there yet, and we don't have many concurrent features and >> fixes going on. >> >> But again, I am happy to reconsider this, when we run into issues >> with the current setup. >> >> Cheers >> Jan >> -- >> >> I'm not sure it will help when we will have n branches. Also I think we > should have more test and c-i. The current situation is not that good and > we spoke about it at the boston summit. Fully agreed! > Anyway if we stay with the current situation yes having one referent doc > would be good. I updated http://wiki.apache.org/couchdb/Merge_Procedure. Cheers Jan --
