[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[m2m-atl-dev] [ATL] Merge of branches R2_1_0_dev and HEAD
|
Hi ATL commiters,
I am currently working on ATL branching / releasing problematics, here
is an explanation of the current state and future plans:
At this time, I created a branch called R2_0_maintenance, based on the
current head, in order to maintain the Ganymede version. It will allow
us to develop in head the future ATL version (2.1 or 3.0).
On the other side, I anticipated the merging of head and the dev
branch, in a "local" way, I mean that nothing has been commit at this
time. When that commit will be effective, developers who used to work on
the R2_1_0_dev branch would be able to develop on HEAD. They also could
create a new branch for unstable developments, but anyway that branch
MUST be based on the merged HEAD (not actually commit). This is, I
think, a very important point for future mergings.
To allow you to test and also to keep a trace of all the changes made
during my "local" merging, I made a patch, available here:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=245716
I'm waiting for any approval/disapproval: merging was quite painful, so
I may have made mistakes... let me know if you have any comments.
Finally (during next week) I will apply the patch, which will allow us
to reverse the process if necessary.
Best regards,
William
begin:vcard
fn:William Piers
n:Piers;William
org:Obeo
adr:2 rue Robert Schumann;;lot 24;NANTES;;44408;France
email;internet:william.piers@xxxxxxx
title:MDA Consultant
tel;work:+33 (0)2 51 13 51 82
tel;cell:+33 (0)6 20 31 75 98
url:http://www.obeo.fr
version:2.1
end:vcard
