Return-Path: X-Original-To: apmail-ofbiz-user-archive@www.apache.org Delivered-To: apmail-ofbiz-user-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E8F8F1794A for ; Fri, 3 Oct 2014 11:06:13 +0000 (UTC) Received: (qmail 18154 invoked by uid 500); 3 Oct 2014 11:06:13 -0000 Delivered-To: apmail-ofbiz-user-archive@ofbiz.apache.org Received: (qmail 18124 invoked by uid 500); 3 Oct 2014 11:06:13 -0000 Mailing-List: contact user-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: user@ofbiz.apache.org Delivered-To: mailing list user@ofbiz.apache.org Received: (qmail 18094 invoked by uid 99); 3 Oct 2014 11:06:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 11:06:13 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of pierre.smits@gmail.com designates 209.85.217.181 as permitted sender) Received: from [209.85.217.181] (HELO mail-lb0-f181.google.com) (209.85.217.181) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 11:05:47 +0000 Received: by mail-lb0-f181.google.com with SMTP id l4so769721lbv.26 for ; Fri, 03 Oct 2014 04:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=WbGvRsHizwGGUjy3GZnzAvgf9woPVHT+XeHpyn18EgI=; b=Thq+SAdcY/6WwTB2VaolR5C8vhlTUZ3Mo5sEoorA+r127i0UMfoltxBSCAtn4tOWCC ZP9iRdRI2GiqywgMlXgwjnuCk0sPlA++9CSBLoAFrdAreXR6ArptGV7T07PpnQFmL5pY /c9B5QiVbkKvpR+fPyPSb9a5OGHG9YT5HKr0+sXBQf5RWfppY5eThyDxyZ0m/FeiBq4K StCKLnzERNLK6FMw7lqQqBCea9QMMM9tGa2HgyF2gpnZy0vIoSAXsM7x8bITMUyXO8pb H/JcZ4Qo2/sn4IOxgms4CHrW1eCQ3+oWh2eyPvX8CAiG/stLiq+pVWG/anxlkGflIBaG vCqw== MIME-Version: 1.0 X-Received: by 10.152.4.97 with SMTP id j1mr4905140laj.73.1412334346802; Fri, 03 Oct 2014 04:05:46 -0700 (PDT) Received: by 10.25.147.194 with HTTP; Fri, 3 Oct 2014 04:05:46 -0700 (PDT) In-Reply-To: <12150158.447.1412333516916.JavaMail.taher@elterro-sam-ultra> References: <12150158.447.1412333516916.JavaMail.taher@elterro-sam-ultra> Date: Fri, 3 Oct 2014 13:05:46 +0200 Message-ID: Subject: Re: Starting a new From: Pierre Smits To: user@ofbiz.apache.org Content-Type: multipart/alternative; boundary=089e0149338c0b9cd5050482b7c0 X-Virus-Checked: Checked by ClamAV on apache.org --089e0149338c0b9cd5050482b7c0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Taher, Every commit registered in trunk should be considered when you have an production implementation that is based on a released version and when you want to stay on top of bug fixes and improvements for your customers. Applying changes to the production environment without due diligence in the production environment for your own or your customers is introducing risk to the sustainability of your and their organisations. Risk mitigation is always a pain. But needs to be done dilligently. Switching to Git, like others in the project have done, does have its advantages when it comes to commits done in another way than through patch files in JIRA issues. Nevertheless, it doesn't forego on the aspect that each commit must be investigated and assessed regarding its impact (risk vs benefit) on your production environment. Regards, Pierre Smits *ORRTIZ.COM * Services & Solutions for Cloud- Based Manufacturing, Professional Services and Retail & Trade http://www.orrtiz.com On Fri, Oct 3, 2014 at 12:51 PM, Taher Alkhateeb wrote: > Hi Pierre, > > If you apply commits selectively, do you handle conflicts manually? It is > a pain for us and that is why we are considering git a major tool for doi= ng > this! > > Taher Alkhateeb > > ----- Original Message ----- > > From: "Pierre Smits" > To: user@ofbiz.apache.org > Sent: Friday, 3 October, 2014 12:34:21 PM > Subject: Re: Starting a new > > Taher, > > We follow a somewhat similar approach. Though our production environment = is > primarily based on the 12.x branch, we do follow al commits in trunk and > apply a good number of them in our versions ahead of releases. > > Regards, > > Pierre Smits > > *ORRTIZ.COM * > Services & Solutions for Cloud- > Based Manufacturing, Professional > Services and Retail & Trade > http://www.orrtiz.com > > On Thu, Oct 2, 2014 at 11:14 PM, Taher Alkhateeb < > slidingfilaments@gmail.com > > wrote: > > > Hi everyone, > > > > On the same topic, would it be a bad/good practice to pull on a certain > > revision from trunk, stabilize it, ship to customer and do an upgrade > once > > in like every six months or so? I am considering this model by committi= ng > > this certain revision into git and branching out on my own work and the= n > > merge whatever i pull from subversion. This way we can stay bleeding ed= ge > > while staying relatively stable. This can also be done in combination > with > > the ofbiz addon manager which we found to be very handy. > > > > Any thoughts on that? > > > > Taher Alkhateeb > > On Oct 2, 2014 11:59 PM, "Jacques Le Roux" > > > wrote: > > > > > I use trunk myself, but like Adrian I'd generally recommend the laste= st > > > release branch. > > > The trunk is really bleeding edge and the only advantage I have using > it > > > is, since I'm a committer, I can interact with it and add new feature= s > I > > > use in custom projects more easily. > > > Anyway if ever you need a new feature from the trunk it's often easy = to > > > simply merge it from the trunk... > > > > > > Jacques > > > > > > Le 02/10/2014 21:57, Adrian Crum a =C3=A9crit : > > > > > >> I recommend always deploying from the latest release branch. Right n= ow > > >> that is 13.07. > > >> > > >> Adrian Crum > > >> Sandglass Software > > >> www.sandglass-software.com > > >> > > >> On 10/2/2014 6:50 PM, Forrest Rae wrote: > > >> > > >>> Hi Everyone, > > >>> > > >>> With a new deployment, starting from scratch, would you go with > 12.04, > > >>> wait for 13.07, or just use the trunk? > > >>> > > >>> -Forrest > > >>> > > >>> > > >> > > > > --089e0149338c0b9cd5050482b7c0--