Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Received-SPF: pass (asf.osuosl.org: domain of eljotpl@gmail.com designates
 66.249.82.205 as permitted sender)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
        s=beta; d=gmail.com;
        h=received:message-id:date:from:reply-to:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
        b=FvWsXFBbFp7biG2agCW5QalBYoaFRMTwwsv/pLydcS9A3UO75QakGloBvvpqCvafsgg5K6bCpMuY+aC+JVLrmyz5hc0AS8+E3/7CBOET84GbvOaCTugx0fqGrDUuNSNMTlgnB5pXnen7u0RncQh2KcWJm5Od/7pno196Z9I9k8k=
Message-ID: <1b5bfeb50604090146u42f3b180hea7e615a11851e34@mail.gmail.com>
Date: Sun, 9 Apr 2006 10:46:36 +0200
From: "Jacek Laskowski" <jacek@laskowski.net.pl>
Reply-To: jacek@laskowski.net.pl
Sender: eljotpl@gmail.com
To: dev@geronimo.apache.org
Subject: Re: Merging from 1.1 to HEAD
In-Reply-To: <74e15baa0604081706y1e199bf5g8e328310ea1f4d15@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
References: <74e15baa0604081706y1e199bf5g8e328310ea1f4d15@mail.gmail.com>

On 4/9/06, Aaron Mulder <ammulder@alumni.princeton.edu> wrote:
> So I'm putting some stuff into 1.1, some of which is related to config
> IDs and some of which is not.
>
> My question is, for the stuff unrelated to config IDs, should I be
> merging to HEAD right away?  Or is it going to be easier if I don't
> and we merge "everything" at once later?

Hi Aaron,

I'd say do what's better for you atm. I guess it's not going to be an
easy task to merge them so the more we've got sooner the better the
merging will be.

Btw, how do you do it? What's the command to merge the branch? Can you
filter out some changes? How?

> I have also previously put some things into HEAD which I would like to
> get into 1.1.  I assume I should merge those to 1.1 soon, because I
> expect we will prepare the 1.1 release before attempting to fully
> merge 1.1 into HEAD.  Is that right?

Matt will surely know the answer, so I leave it to him ;)

>     Aaron

Jacek

--
Jacek Laskowski
http://www.laskowski.org.pl