Re: [tracecompass-dev] Branching for 1.1

[Marc-André Laperle <marc-andre.laperle@xxxxxxxxxxxx>]

I'll just continue the discussion here about tracecompass-stable-nightly. The question is, which branch should it build? What do we want to put in the stable update site http://download.eclipse.org/tracecompass/stable/ . I am thinking it should build stable-1.0 which means any fixes applied post release and potentially critical fixes will end up in this repository. I think the dev-1.x branch, even though it doesn't break the API, might be a bit too "unstable" because it will add more features that might not be as tested yet so I don't think it should populate the stable update site. Once Trace Compass 1.1 releases, the stable update site could be populated by stable-1.1 and so on for 1.2. About dev-1.x, I think it should populate a new update site, I was thinking http://download.eclipse.org/tracecompass/mars/dev-1.x

So:
- I think tracecompass-stable-nightly should build stable-1.0 and populate the tracecompass/stable update site.
- I think tracecompass-dev-1.x-nightly should build dev-1.x and populate tracecompass/mars/dev-1.x
- tracecompass-master-nightly continues to build master and populate tracecompass/master

Let me know if you disagree with this of have other suggestions
Marc-Andre

________________________________________
From: tracecompass-dev-bounces@xxxxxxxxxxx [tracecompass-dev-bounces@xxxxxxxxxxx] on behalf of Marc-André Laperle [marc-andre.laperle@xxxxxxxxxxxx]
Sent: Thursday, 25 June 2015 7:07 PM
To: tracecompass developer discussions
Subject: Re: [tracecompass-dev] Branching for 1.1

OK so I created the dev-1.x branch based on commit 853beb540ed0bc2663bd0ff645ba310d8ab633cc (tmf.ui: introduce TmfSimpleTableViewer)

I have also created a   tracecompass-dev-1.x-nightly Hudson job. I will start a separate discussion about what do to with tracecompass-stable-nightly. I will look tomorrow at fixing the API errors in both master and dev-1.x branches.

Thank you,
Marc-Andre
________________________________________
From: tracecompass-dev-bounces@xxxxxxxxxxx [tracecompass-dev-bounces@xxxxxxxxxxx] on behalf of Matthew Khouzam [matthew.khouzam@xxxxxxxxxxxx]
Sent: Thursday, 25 June 2015 11:22 AM
To: tracecompass-dev@xxxxxxxxxxx
Subject: Re: [tracecompass-dev] Branching for 1.1

+1 for dev-1.x

On 15-06-25 11:20 AM, Bernd Hufmann wrote:
> dev-1.x is fine with me.
>
> Bernd
>
> On 06/25/2015 11:18 AM, Marc-André Laperle wrote:
>> I agree "stable" is not the best since it's usually used when we
>> branch when we're about to release. I think I prefer dev-1.x over
>> master-1.x just because I see master as a "reserved" keyword :) I'll
>> give a bit more time for others to comment.
>>
>> Marc-Andre
>>
>> ------------------------------------------------------------------------
>> *From:* tracecompass-dev-bounces@xxxxxxxxxxx
>> [tracecompass-dev-bounces@xxxxxxxxxxx] on behalf of Bernd Hufmann
>> [bernd.hufmann@xxxxxxxxxxxx]
>> *Sent:* Thursday, 25 June 2015 11:08 AM
>> *To:* tracecompass-dev@xxxxxxxxxxx
>> *Subject:* Re: [tracecompass-dev] Branching for 1.1
>>
>> Hi Marc-Andre
>>
>> thanks for taking this initiative.
>>
>> Yes, we should branch today. I'm not set on a name. I would not use
>> "stable-1.x" because we use the prefix "stable-" for release
>> branches, though. What about master-1.x or dev-1.x? However, I'd like
>> this branch to be used for the development activities for releases
>> 1.1. and 1.2 (possibly). When it's time for the release branch, we'll
>> branch off stable-1.1 and stable-1.2 from this branch directly.
>>
>> Thanks
>> Bernd
>>
>>
>> On 06/25/2015 10:08 AM, Marc-André Laperle wrote:
>>> Hi,
>>>
>>> I'd like to create the new branch that will target 1.1 today. What
>>> should we call it? stable-1.x so that 1.2 development happens in the
>>> same branch too? I'd branch from the current commit in master
>>> (91d6dce421420132e74040ae9414756dcb6c88e1 rcp: Build proper .app on
>>> Mac). Then we can fix the API errors and such.
>>>
>>> Marc-Andre
>>>
>>>
>>> _______________________________________________
>>> tracecompass-dev mailing list
>>> tracecompass-dev@xxxxxxxxxxx
>>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>>> https://dev.eclipse.org/mailman/listinfo/tracecompass-dev
>>
>>
>>
>> _______________________________________________
>> tracecompass-dev mailing list
>> tracecompass-dev@xxxxxxxxxxx
>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>> https://dev.eclipse.org/mailman/listinfo/tracecompass-dev
>
>
>
> _______________________________________________
> tracecompass-dev mailing list
> tracecompass-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/tracecompass-dev

_______________________________________________
tracecompass-dev mailing list
tracecompass-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/tracecompass-dev
_______________________________________________
tracecompass-dev mailing list
tracecompass-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/tracecompass-dev