Return-Path: Delivered-To: apmail-jackrabbit-dev-archive@www.apache.org Received: (qmail 63238 invoked from network); 9 Sep 2009 11:48:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Sep 2009 11:48:57 -0000 Received: (qmail 84115 invoked by uid 500); 9 Sep 2009 11:48:57 -0000 Delivered-To: apmail-jackrabbit-dev-archive@jackrabbit.apache.org Received: (qmail 84038 invoked by uid 500); 9 Sep 2009 11:48:57 -0000 Mailing-List: contact dev-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list dev@jackrabbit.apache.org Received: (qmail 84030 invoked by uid 99); 9 Sep 2009 11:48:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2009 11:48:57 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jukka.zitting@gmail.com designates 209.85.210.181 as permitted sender) Received: from [209.85.210.181] (HELO mail-yx0-f181.google.com) (209.85.210.181) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2009 11:48:49 +0000 Received: by yxe11 with SMTP id 11so6993886yxe.15 for ; Wed, 09 Sep 2009 04:48:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:content-type :content-transfer-encoding; bh=mxLriur1Y6ARKPXeKB8OWdQWEJixFDuyQx0m7K2bNSM=; b=sFM90MTUQVZsc8YHjOOKG7CTHFy6OrxATUUQzWE61InEfyIIsghLxEmoQJ+ioHM+cY 7YaDCUjHMG6xIpVf+3/EVLmQwcncCSCVtY00nrk+2k+vT8GrpR+o4s/IBZm6sNgr559q 1Xwg6Ig2TU3E7tDKBTjZbsl66zlemSj0q+C9Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type:content-transfer-encoding; b=S8Wu8RPxly/i0nuOU3ko6TJ2jDnNP3I0se/Mn3ZsmNy2uAgbsGKxKJqQlsOrTohzst Ub9OkFoT86qt8kmZd+Xhz/tkBZagkKgHqpkjG7wnMAF+EQMGVORARy9AkMqwLn++fWjG vGvxTmS3ZBlcW7+sL/zadzQDVR/gVLoybe73o= MIME-Version: 1.0 Received: by 10.100.17.14 with SMTP id 14mr50081anq.163.1252496908155; Wed, 09 Sep 2009 04:48:28 -0700 (PDT) In-Reply-To: <510143ac0908310605q79730860sa94c54978334babf@mail.gmail.com> References: <4A97FDC1.8000808@anyware-tech.com> <510143ac0908300207j376f1a60q3130348dc82212df@mail.gmail.com> <4A9B986A.8000006@anyware-tech.com> <510143ac0908310605q79730860sa94c54978334babf@mail.gmail.com> From: Jukka Zitting Date: Wed, 9 Sep 2009 13:48:08 +0200 Message-ID: <510143ac0909090448p47a0dfe2n7beda53aa50b8ebb@mail.gmail.com> Subject: Re: Branch and backports management To: dev@jackrabbit.apache.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Hi, On Mon, Aug 31, 2009 at 3:05 PM, Jukka Zitting wro= te: > On Mon, Aug 31, 2009 at 11:31 AM, S=E9bastien > Launay wrote: >> But this branch may also be created from 1.6 when a new release >> branch is really needed in order to avoid multiple backports >> from branches to branches. > > Good point, that'll probably be an easier approach. I notice you started merging changes back to the 1.x and 1.6 branches. Than= ks! Feel free to delete the 1.x branch to avoid the extra work. As you said, we can recreate the branch from 1.6 later if needed. BR, Jukka Zitting