From dev-return-22492-apmail-forrest-dev-archive=forrest.apache.org@forrest.apache.org Wed Feb 01 19:49:03 2006 Return-Path: Delivered-To: apmail-forrest-dev-archive@www.apache.org Received: (qmail 45844 invoked from network); 1 Feb 2006 19:49:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Feb 2006 19:49:02 -0000 Received: (qmail 95935 invoked by uid 500); 1 Feb 2006 19:49:01 -0000 Delivered-To: apmail-forrest-dev-archive@forrest.apache.org Received: (qmail 95889 invoked by uid 500); 1 Feb 2006 19:49:01 -0000 Mailing-List: contact dev-help@forrest.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@forrest.apache.org List-Id: Delivered-To: mailing list dev@forrest.apache.org Received: (qmail 95875 invoked by uid 99); 1 Feb 2006 19:49:01 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2006 11:49:00 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [212.247.154.97] (HELO swip.net) (212.247.154.97) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Feb 2006 11:49:00 -0800 X-T2-Posting-ID: sqekuHx5EEXz8PMiWfS+nn/CVSJ13AovswB5l38CkqQ= X-Cloudmark-Score: 0.000000 [] Received: from [83.180.135.252] (HELO [192.168.2.5]) by mailfe04.swip.net (CommuniGate Pro SMTP 5.0.2) with ESMTP id 106063307 for dev@forrest.apache.org; Wed, 01 Feb 2006 20:48:35 +0100 Subject: to branch or not to branch part II (was Re: Dispatcher rc1) From: Thorsten Scherler To: dev@forrest.apache.org In-Reply-To: <43E0D5D2.1080900@apache.org> References: <1138576606.8283.46.camel@localhost.localdomain> <20060201080537.GA3761@igg.indexgeo.com.au> <43E0B1E4.3080302@apache.org> <1138801657.14636.30.camel@localhost> <43E0D5D2.1080900@apache.org> Content-Type: text/plain; charset=UTF-8 Date: Wed, 01 Feb 2006 20:48:32 +0100 Message-Id: <1138823313.8311.33.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.2.1.1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N El mi=C3=A9, 01-02-2006 a las 15:37 +0000, Ross Gardler escribi=C3=B3: > To Branch or not to Branch? > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D >=20 > [ASIDE] Don't worry Thorsten I'm not going to ask you to change anything=20 > . I heard your frustration at the circular discussion about "to branch=20 > or not to branch", that is why I stayed quite in the end, I was silently=20 > agreeing to you just getting it done Thanks for that, I really appreciate what you have done because I could do the job. >=20 > This lack of ability to support both V2 and V3 during this work, which=20 > Thorsten had previously warned us about, was the reason I recommended a=20 > branch. Actually the fault is lying in=20 http://issues.apache.org/jira/browse/FOR-799 which normally should not be the standard situation for plugins and our new properties system looks very promising to overcome the need for such situations. IMO Forrest should support different versions of plugins which should be configurable on a project base. That would make it easy to develop different versions of plugins without the need of a branch. >=20 > For the future reference of the community (not for Thorsten or any other=20 > individual), if a development will temporarily break existing=20 > functionality we should branch.=20 IMO only for core code.=20 > This was one of the criteria we=20 > identified for branching in our previous discussions on this subject. > With a branch we could just do an svn switch and it would work, then we=20 > could just switch back to trunk to work with v2 stuff if necessary. You are totally right and regarding core code I am with you to branch. One problem is that switching branches as well leads sometimes to conflicts due to e.g. locally modified sources. If we do not deal with core code I prefer a new version of a plugin rather then a branch. > Thorsten did point us at this patch within the large number of commit=20 > emails and Jira issues he generated in his mammoth weekend attack on=20 > this work.=20 :) thx for the compliment. ;-) > However, it seems both David and I missed the importance of=20 > that message and have therefore wasted our time, and Thorstens, in=20 > debugging the issue. >=20 No, you have not wasted my time, but helped pointing out that the instructions on the FOR-796 have been confusing (I am changing them right now). Thanks. salu2 --=20 thorsten "Together we stand, divided we fall!"=20 Hey you (Pink Floyd)