Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2F33B1732F for ; Mon, 29 Sep 2014 20:18:38 +0000 (UTC) Received: (qmail 6404 invoked by uid 500); 29 Sep 2014 20:18:37 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 6370 invoked by uid 500); 29 Sep 2014 20:18:37 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 6357 invoked by uid 99); 29 Sep 2014 20:18:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 20:18:37 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of cmarcelk@gmail.com designates 209.85.192.48 as permitted sender) Received: from [209.85.192.48] (HELO mail-qg0-f48.google.com) (209.85.192.48) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 20:18:09 +0000 Received: by mail-qg0-f48.google.com with SMTP id i50so2368534qgf.7 for ; Mon, 29 Sep 2014 13:18:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date :content-transfer-encoding:message-id:references:to; bh=UQnkd3pIhCXrmt6mDi3SZ+adAXyGFP4HDnqBc/N5AUU=; b=PxtNrSLKsxA+7YOnfqwkIT7fwrPBUEyTWyR2ApxtyphzTa9FPel5oiBchx68cuSEH0 MX2d+IwTfmrUfQi+WYblw5XDI6ddn+sWrg36npUOpjeeiCfY2T7X+IQQCt6LmTWEKSdb p2wymsTr4v1Ikpz4wS1vJa6mRWu2pfiuGywOg/SlVRPvRpOcRzxlEP5Z4cwxtLpRA2gH 5NvioU+kG9AAzMa557H96joKv8VT6mdo4Ca7Bkho3Nj9maxEJzDcn9mDFsV+LMiMNRk+ 2r7sDpyY/lI3VC4X9nyJIequeNYxulJhpjCWnum4Ge722vKm7/cUhyh2gPPcTh8fjWN3 JSTQ== X-Received: by 10.229.40.131 with SMTP id k3mr13481350qce.11.1412021888047; Mon, 29 Sep 2014 13:18:08 -0700 (PDT) Received: from [192.168.1.248] (cpe-065-190-081-241.nc.res.rr.com. [65.190.81.241]) by mx.google.com with ESMTPSA id c108sm2538493qgc.23.2014.09.29.13.18.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Sep 2014 13:18:07 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: confuse about cordova-cli branches From: Marcel Kinard In-Reply-To: Date: Mon, 29 Sep 2014 16:18:04 -0400 Content-Transfer-Encoding: quoted-printable Message-Id: <2412E5DD-A0A0-4623-956E-14FEDE157129@gmail.com> References: To: dev@cordova.apache.org X-Mailer: Apple Mail (2.1878.6) X-Virus-Checked: Checked by ClamAV on apache.org I suggest that the way we do branches and the x.y+1.0 numbering scheme = for platforms should also be the way we do it on tools and plugins. The "rb_*" branches I created for the multiple runs at the 3.6 release = were a hack that shouldn't be repeated. On Sep 26, 2014, at 4:43 PM, Carlos Santana = wrote: > Are we using branches for cordova-cli and cordova-lib? > Meaning there is a branch 3.6.x, where we put things there and then = cherry > pick into master (tobe 3.7.x) ? >=20 > I see this branch b_3.6.0-0.2.8 in cordova-cli is this the 3.6.x = branch? > And then it's related with with tag 3.6.0-0.2.13? >=20 > Can we have only two branches for cli/lib "3.6.x" and "master" and = keep it > simple. >=20 > --=20 > Carlos Santana >