Return-Path: Delivered-To: apmail-maven-continuum-dev-archive@www.apache.org Received: (qmail 70382 invoked from network); 10 Mar 2008 23:09:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Mar 2008 23:09:35 -0000 Received: (qmail 4451 invoked by uid 500); 10 Mar 2008 23:09:32 -0000 Delivered-To: apmail-maven-continuum-dev-archive@maven.apache.org Received: (qmail 4419 invoked by uid 500); 10 Mar 2008 23:09:31 -0000 Mailing-List: contact continuum-dev-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-dev@maven.apache.org Received: (qmail 4408 invoked by uid 99); 10 Mar 2008 23:09:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Mar 2008 16:09:31 -0700 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (athena.apache.org: 124.108.96.112 is neither permitted nor denied by domain of rahul.thakur.xdev@gmail.com) Received: from [124.108.96.112] (HELO rel105.mail.aue.yahoo.com) (124.108.96.112) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 10 Mar 2008 23:08:52 +0000 Received: (qmail 15865 invoked by uid 1000); 10 Mar 2008 23:08:55 -0000 Received: from 124.108.96.72 by rel105.mail.aue.yahoo.com with SMTP; Mon, 10 Mar 2008 16:08:55 -0700 Received: (qmail 35339 invoked from network); 10 Mar 2008 23:08:55 -0000 Received: from unknown (HELO ?192.168.103.153?) (rahul.thakur@xtra.co.nz@203.193.119.196 with plain) by smtp103.tnz.mail.aue.yahoo.com with SMTP; 10 Mar 2008 23:08:55 -0000 X-YMail-OSG: QQJzsqIVM1l6DS2jOay9pzHS9fzflkdGOECEfYS4xkrakCJk47eGd6AqtvcispTH_g-- X-Yahoo-Newman-Property: ymail-3 Message-ID: <47D5BF8B.6000802@gmail.com> Date: Tue, 11 Mar 2008 12:08:59 +1300 From: Rahul Thakur User-Agent: Thunderbird 3.0a1pre (Windows/2008030403) MIME-Version: 1.0 To: continuum-dev@maven.apache.org Subject: Re: Confused about the branches References: <4721EE6A-7703-434B-BAEE-F38C9C403BE6@apache.org> <47D4A830.5000704@gmail.com> <9948cb690803100356r6345134g77c8bcc1054c3d38@mail.gmail.com> In-Reply-To: <9948cb690803100356r6345134g77c8bcc1054c3d38@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org The branches have been removed except for 'continuum-site_1.1' which had some updates a few months ago. If this is not required please feel free to remove. Rahul Olivier Lamy wrote: > IMHO, we can remove. > > 2008/3/10, Rahul Thakur: >> There are some other branches residing in Continuum SVN. Should we >> remove any (or all) of the following if they are not in active >> development? I know (id-refactor and key-based-refactor can go) >> >> # continuum-acegi >> # continuum-site_1.1 >> # gbuild >> # id-refactor >> # key-based-refactor >> # osworkflow-integration >> # release-integration >> >> Cheers, >> Rahul >> >> >> Brett Porter wrote: >> > Hi, >> > >> > I'm a bit confused about the current branch scenarios, we have 1.2 on a >> > branch and 2.0 on trunk. Several changes have been made on each, and >> > none merged to the other. >> > >> > Can I suggest we merge all branch changes to trunk, rename trunk to >> > 1.2-SNAPSHOT, and the branch to continuum-1.1.x (1.1.1-SNAPSHOT) and use >> > that for bugfixes only? >> > >> > WDYT? >> >> > - Brett >> > >> > -- >> > Brett Porter >> > brett@apache.org >> > http://blogs.exist.com/bporter/ >> > >> > >> >