Re: [m2m-atl-dev] [ATL] Merge of branches R2_1_0_dev and HEAD

[William Piers <william.piers@xxxxxxx>]

Ok, so the merging will be effective today. I added some modifications 
on the patch, always on the same bug.

For the unstable changes on EMF driver, the best thing to do is to wait 
for the merging on head, then recreate a branch based on "new" head 
where to commit changes. This will allow us to apply the improvement on 
head as soon as we consider it as "stable" :-) .

Best regards,
William

Dennis Wagelaar a écrit :
> I'm fine with merging entire R2_1_0_dev into HEAD, as long as there is 
> a clear announcement when this happens.
>
> Currently, I'm experimenting with a non-static, disposable ResourceSet 
> in the ATL EMF driver to resolve more memory leaks (EMF silently 
> auto-loads referenced resources). That means I have some unstable 
> changes that need to be committed sooner or later.
>
> Regards,
> Dennis
>
> On 29 Aug 2008, at 18:01, William Piers wrote:
>
> > 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
> >
> > <william_piers.vcf>_______________________________________________
> > m2m-atl-dev mailing list
> > m2m-atl-dev@xxxxxxxxxxx
> > https://dev.eclipse.org/mailman/listinfo/m2m-atl-dev
>
> _______________________________________________
> m2m-atl-dev mailing list
> m2m-atl-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/m2m-atl-dev

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