Re: [mdt-ocl.dev] GIT Practice

["Willink, Ed" <Ed.Willink@xxxxxxxxxxxxxxx>]

HI ADolfo

Certainly.

I'm assuming that like CVS master is for 3.2.

But I think that one of the good features of GIT is topic branches, so if
each improvement is in a topic branch we
can choose which topic branches to apply to maintenance/R3_1 as well as
master.

So I think your stuff should be in a bug/nnnnnn topic branch.

Ah! oops yes. Hopefully it's not too difficult to find the branch point
since it was GIT time zero. 

Axel: can you create maintenance/R3_1 please.

	Regards

> -----Original Message-----
> From: mdt-ocl.dev-bounces@xxxxxxxxxxx 
> [mailto:mdt-ocl.dev-bounces@xxxxxxxxxxx] On Behalf Of Adolfo 
> Sánchez-Barbudo Herrera
> Sent: 15 June 2011 15:21
> To: mdt-ocl.dev@xxxxxxxxxxx
> Subject: Re: [mdt-ocl.dev] GIT Practice
> 
> Guys,
> 
> I think we need a branch for the R3_1 maintenance stream, before 
> starting to push changes to master, don't we ?
> 
> Cheers,
> Adolfo.
> 
> El 14/06/2011 23:19, Axel Uhl escribió:
> > Done. The branches as listed by "git ls-remote" now are:
> >
> > refs/heads/bug/304642
> > refs/heads/bug/348502
> > refs/heads/bug/348504
> > refs/heads/bug/349117
> > refs/heads/bug/349125
> > refs/heads/bug/349157
> > refs/heads/cvs/Europa
> > refs/heads/cvs/MDT_OCL_3_0_0_ReflectiveLibrary
> > refs/heads/cvs/MDT_OCL_3_0_0_Releng_Experimental
> > refs/heads/cvs/OCL_2_0_support
> > refs/heads/cvs/OCL_2_1_on_LPGv2_Experimental
> > refs/heads/maintenance/R1_0
> > refs/heads/maintenance/R1_1
> > refs/heads/maintenance/R1_2
> > refs/heads/maintenance/R3_0
> > refs/heads/master
> > refs/heads/origin
> >
> > Best,
> > -- Axel
> >
> > On 6/14/2011 8:18 PM, Ed Willink wrote:
> >> Hi Axel
> >>
> >>>>> Let me know which commits you'd like to have as which 
> branches and I
> >>>>> can issue the necessary git commands.
> >>>> That doesn't make sense to me. Commits have already happened in
> >>>> appropriate branches so I don't understand how they 
> would sensibly be
> >>>> moved.
> >>>
> >>> The current list of tags/branches is this:
> >>>
> >>> 193979f9003c0553d0b3e6ed94ef54dac7a5c551 refs/heads/Europa
> >>> 5a9fe6ef71a627d6cd9ffd0eba21b0ed346770cb
> >>> refs/heads/MDT_OCL_3_0_0_ReflectiveLibrary
> >>> 7f960a8d55ad9b144164a975376a4935cee7a2ec
> >>> refs/heads/MDT_OCL_3_0_0_Releng_Experimental
> >>> 275667fc1dd6d528286f87f34245453d9a0f28b5 
> refs/heads/OCL_2_0_support
> >>> 1be87282378bf44ae5aa510f892c8459b00d2a89
> >>> refs/heads/OCL_2_1_on_LPGv2_Experimental
> >> I suggest adding a cvs/ prefix to each of the old CVS 
> branches, which
> >> are, I think, each of the above.
> >>> 9a143d9c24a1da3845e5dcc946462e1c1b95c6e2 
> refs/heads/R1_0_maintenance
> >>> ec5d0adc8fb8acb49da069b3d64b669e91150d5c 
> refs/heads/R1_1_maintenance
> >>> 4fadd6b4c3dbf6f51d0f4a72c8ec3e899da6fc70 
> refs/heads/R1_2_maintenance
> >>> 5109b7e37f5611e170c4eaa4dd202e009e5e897c 
> refs/heads/R3_0_maintenance
> >> and changing *_maintenance to maintenance/* for the above
> >>
> >> -----
> >>
> >> Now that you've got ssh working perhaps you can answer my 
> queries. Why
> >> do you need two keys?
> >> Why should I use your keys? ...
> >>
> >> Regards
> >>
> >> Ed
> >> _______________________________________________
> >> mdt-ocl.dev mailing list
> >> mdt-ocl.dev@xxxxxxxxxxx
> >> https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev
> >>
> >>
> > _______________________________________________
> > mdt-ocl.dev mailing list
> > mdt-ocl.dev@xxxxxxxxxxx
> > https://dev.eclipse.org/mailman/listinfo/mdt-ocl.dev
> >
> 
> -- 
> Open Canarias, S.L.
> 	*Adolfo Sánchez-Barbudo Herrera*
> adolfosbh(at)opencanarias(dot)com 
> <mailto:adolfosbh%28at%29opencanarias%28dot%29com>
> C/Elías Ramos González, 4, ofc. 304
> 38001 SANTA CRUZ DE TENERIFE
> Tel.: +34 922 240231
> 
> 

Please consider the environment before printing a hard copy of this 
e-mail. 
 
The information contained in this e-mail is confidential. It is intended 
only for the stated addressee(s) and access to it by any other person is 
unauthorised. If you are not an addressee, you must not disclose, copy, 
circulate or in any other way use or rely on the information contained in 
this e-mail. Such unauthorised use may be unlawful. If you have received 
this e-mail in error, please inform us immediately on +44 (0)118 986 8601 
and delete it and all copies from your system. 
 
Thales Research and Technology (UK) Limited. A company registered in 
England and Wales. Registered Office: 2 Dashwood Lang Road, The Bourne 
Business Park, Addlestone, Weybridge, Surrey KT15 2NX. Registered Number: 
774298 
 
Thales UK Limited. A company registered in England and Wales. Registered 
Office: 2 Dashwood Lang Road, The Bourne Business Park, Addlestone, 
Weybridge, Surrey KT15 2NX. Registered Number: 868273