Le 13 novembre 2009 11:44, Picca Frédéric-Emmanuel <span dir="ltr"><<a href="mailto:frederic-emmanuel.picca@synchrotron-soleil.fr">frederic-emmanuel.picca@synchrotron-soleil.fr</a>></span> a écrit :<br><div class="gmail_quote">
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Le Fri, 13 Nov 2009 06:44:54 +0100,<br>
Farzad Sehat <<a href="mailto:farzad.sehat@gmail.com">farzad.sehat@gmail.com</a>> a écrit :<br>
<br>
Thanks for the new organisation.<br>
<div class="im"><br>
> Lisaac team has now a new git organization policy:<br>
><br>
> - Nobody must commit to the master branch of the compiler.git<br>
<br>
</div>Who is in charge of the merge for this master branch ?<br></blockquote><div><br>Benoit Sonntag<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
must we send patches to the mailing list ?<br></blockquote><div><br>Not specialy, you can have a branch name_feature and Benoit will check your branch and take <br>what he thinks is interessant to merge.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
> - Any commit in the master branch of the compiler.git is prohibited and<br>
<div class="im">> after 3 warnings you are baned from the team<br>
<br>
</div>ok.<br>
<br>
> - Nobody must create Git *repository* without asking first to Xavier<br>
<div class="im">> Oswald <<a href="mailto:x.oswald@lisaac.org">x.oswald@lisaac.org</a>><br>
<br>
</div>ok.<br>
<br>
> - You can create *branches *in each Git repositories with the following<br>
<div class="im">> rule:<br>
><br>
> <name>_<feature> where feature is the reason why you want a new branch<br>
<br>
</div>How must I rename the debian branch ?<br>
Maybe it would be better for the person in charge of the repository to create the branch<br>
after a discussion on the mailling list ?<br>
<br>
Also, Must I merge the debian branch with the stable or the master branch ?<br></blockquote><div><br>For the debian branch you have to ask to Xavier Oswald but you have not to merge with master.<br> </div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<div class="im"><br>
><br>
> - Please make the necessary to remove all old branches and to follow the<br>
> new policy<br>
> - Please update your code with the new beta compiler release in order to<br>
> be ready for the future stable release<br>
><br>
><br>
> Also, new emails are available:<br>
> All team member has two emails like that :<br>
> <first name>.<last name>@<a href="http://lisaac.org" target="_blank">lisaac.org</a><br>
> <first letter of the first name>.<last name>@<a href="http://lisaac.org" target="_blank">lisaac.org</a><br>
> These emails are forwarded to your old website's email.<br>
<br>
</div>thanks<br>
<br>
Frederic<br>
<font color="#888888"><br>
--<br>
GPG public key 1024D/A59B1171 2009-08-11<br>
fingerprint = 1688 A3D6 F0BD E4DF 2E6B 06AA B6A9 BA6A A59B 1171<br>
uid Picca Frédéric-Emmanuel <<a href="mailto:picca@synchrotron-soleil.fr">picca@synchrotron-soleil.fr</a>><br>
</font></blockquote></div><br>