Return-Path: Delivered-To: apmail-myfaces-dev-archive@www.apache.org Received: (qmail 80375 invoked from network); 3 May 2006 21:26:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2006 21:26:13 -0000 Received: (qmail 39996 invoked by uid 500); 3 May 2006 21:25:44 -0000 Delivered-To: apmail-myfaces-dev-archive@myfaces.apache.org Received: (qmail 39950 invoked by uid 500); 3 May 2006 21:25:44 -0000 Mailing-List: contact dev-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list dev@myfaces.apache.org Received: (qmail 39939 invoked by uid 99); 3 May 2006 21:25:44 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 14:25:44 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of awiner@gmail.com designates 64.233.162.201 as permitted sender) Received: from [64.233.162.201] (HELO nz-out-0102.google.com) (64.233.162.201) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 May 2006 14:25:43 -0700 Received: by nz-out-0102.google.com with SMTP id z6so299178nzd for ; Wed, 03 May 2006 14:25:23 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=V7Yry8sQ8xJLSpac36AWi2+gtP0U4eEHrwnDsLCF6t0bxCcAI4DORFtkCmGObe5ECn8cev3b7NyHwnFJ1N6GyrVaP6DKCVAN8mNH8Js/A5tzbWvr7Ut4St8VTx308PlmRlgrBIBf8NKM4kJO4Abayomtc+9efZuFUG7DsKLpI0E= Received: by 10.65.243.5 with SMTP id v5mr91043qbr; Wed, 03 May 2006 14:25:22 -0700 (PDT) Received: by 10.65.100.6 with HTTP; Wed, 3 May 2006 14:25:22 -0700 (PDT) Message-ID: <6dac79b90605031425v7b09b3feo59b1e79af16c13a3@mail.gmail.com> Date: Wed, 3 May 2006 14:25:22 -0700 From: "Adam Winer" To: "MyFaces Development" Subject: Re: JSF 1.2: branch, wiki, maven repo, ... In-Reply-To: <564d4f680605031155u1d24fb2chf3b0b3065e54521a@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Content-Disposition: inline References: <5a99335f0604240634y770214efu363c212e92d2df77@mail.gmail.com> <2387fbc50604240750q5a5b2ad0t810c0dabab4e5e03@mail.gmail.com> <564d4f680605031155u1d24fb2chf3b0b3065e54521a@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N On 5/3/06, Manfred Geiler wrote: > Sean, > what you are proposing is something like this: > .../myfaces/core/branches/1_1/1_1_2 > .../myfaces/core/branches/1_1/1_1_3 > .../myfaces/core/trunk <-- JSF 1.2 > Right? > > What about the following solution: > .../myfaces/core_1_1/trunk > .../myfaces/core_1_1/branches/1_1_2 > .../myfaces/core_1_1/branches/1_1_3 > .../myfaces/core_1_2/trunk > .../myfaces/core_1_2/branches/1_2_0 > .../myfaces/core_1_2/branches/1_2_1 > > Is it possible to merge code from different repo roots? > In other words: Would we be able to merge down (up?) changes from > .../myfaces/core_1_2/trunk to .../myfaces/core_1_1/trunk ? Manfred, In Subversion, you can merge from anywhere to anywhere else; "trunk" and "branches" are just conventions. -- Adam