Mailing-List: contact deltaspike-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: deltaspike-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of gerhard.petracek@gmail.com
 designates 209.85.160.175 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <1329168592.35745.YahooMailNeo@web171517.mail.ir2.yahoo.com>
References: 
 <CAGJtJfHz94_YM89KF8FuZr5TuRTJ-00HmgRkzpBabHuesvytQQ@mail.gmail.com>
 <1329168592.35745.YahooMailNeo@web171517.mail.ir2.yahoo.com>
From: Gerhard Petracek <gerhard.petracek@gmail.com>
Date: Mon, 13 Feb 2012 22:50:21 +0100
Message-ID: 
 <CAGJtJfHCeYDoOXsbTKfC=tNNH=2pOPN-FNe8JJOZNZm2CDqPtg@mail.gmail.com>
Subject: Re: release branches
To: deltaspike-dev@incubator.apache.org
Content-Type: multipart/alternative; boundary=0016e6d3e2244d222f04b8df786c

--0016e6d3e2244d222f04b8df786c
Content-Type: text/plain; charset=ISO-8859-1

+1

regards,
gerhard


2012/2/13 Mark Struberg <struberg@yahoo.de>

> I'd say we just push the release-branch + the release-tag and then merge
> them over to master. This is only needed to upgrade the versions.
>
> LieGrue,
> strub
>
>
> >________________________________
> > From: Gerhard Petracek <gerhard.petracek@gmail.com>
> >To: deltaspike <deltaspike-dev@incubator.apache.org>
> >Sent: Monday, February 13, 2012 1:49 PM
> >Subject: release branches
> >
> >hi @ all,
> >
> >since a new commit was pushed before we merged back the release branch, we
> >have to discuss release branches right now.
> >
> >the options i see right now are:
> >1) we push the external named release-branch as it is (+ tag) and rebase
> >the master
> >2) we merge the external release branch locally and just push the result
> >as i did with the master at [1]
> >3) we don't allow pushes (in the future) before we pushed the fast
> >forwarded master.
> >
> >regards,
> >gerhard
> >
> >[1] https://github.com/os890/DS_Discuss
> >
> >
> >
>

--0016e6d3e2244d222f04b8df786c--