On Jul 30, 2014, at 5:13 PM, David Nalley wrote:
> On Wed, Jul 30, 2014 at 4:26 PM, Daan Hoogland
> wrote:
>
>> On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen
>> wrote:
>>> and merge it in other needed branches (master and develop)
>>
>>
>> that part will be hard as it will merge all
On Wed, Jul 30, 2014 at 4:26 PM, Daan Hoogland
wrote:
> On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen
> wrote:
> > and merge it in other needed branches (master and develop)
>
>
> that part will be hard as it will merge all commits (also hotfixes and
> others) that aren't on the the ances
On Wed, Jul 30, 2014 at 10:15 PM, Sebastien Goasguen wrote:
> and merge it in other needed branches (master and develop)
that part will be hard as it will merge all commits (also hotfixes and
others) that aren't on the the ancestry of the branch to merge into.
So this is only possible if the 4.4
On Jul 30, 2014, at 2:38 PM, Mike Tutkowski
wrote:
> My understanding is that the -forward concept goes away after 4.4.1.
>
yes +1
instead of asking for a cherry-pick from -forward, folks should ask the RM to
merge from their cloudstack-WXYZ branch
and merge it in other needed branches (ma
My understanding is that the -forward concept goes away after 4.4.1.
On Wednesday, July 30, 2014, Rohit Yadav wrote:
>
> On 30-Jul-2014, at 6:11 pm, Daan Hoogland > wrote:
>
> > Well Rohit,
> >
> > I was thinking we should not use 4.4-forward anymore at all (or create
> > a new one) Merging bac
On 30-Jul-2014, at 6:11 pm, Daan Hoogland wrote:
> Well Rohit,
>
> I was thinking we should not use 4.4-forward anymore at all (or create
> a new one) Merging back from it at the moment costs to much conflicts.
>
> I'd say we work on branches taken from 4.4 on a per fix basis and
> merge those t
Well Rohit,
I was thinking we should not use 4.4-forward anymore at all (or create
a new one) Merging back from it at the moment costs to much conflicts.
I'd say we work on branches taken from 4.4 on a per fix basis and
merge those that are proven.
makes sense?
On Wed, Jul 30, 2014 at 5:37 PM,
Hi Daan,
On 24-Jul-2014, at 6:20 pm, Daan Hoogland wrote:
> People (especially test developers),
>
> please stop using 4.4-forward and switch to 4.4
>
> If we do a code freeze for 4.4.1 make a new branch per fix, the model
> of a -forward branch is fundamentally broken and has cost me a few
> h
People (especially test developers),
please stop using 4.4-forward and switch to 4.4
If we do a code freeze for 4.4.1 make a new branch per fix, the model
of a -forward branch is fundamentally broken and has cost me a few
hours of merge trouble over the past two months.
thanks,
--
Daan
