Re: [tracecompass-dev] Branching for 1.1

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

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