<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">2013/12/3 Marc Delisle <span dir="ltr"><<a href="mailto:marc@infomarc.info" target="_blank">marc@infomarc.info</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Le 2013-12-03 01:46, Hugues Peccatte a écrit :<br>
<div>> Hi Marc,<br>
><br>
> Thanks, this is the page I was looking for.<br>
> So I'll merge it as soon as possible.<br>
<br>
</div>Hugues,<br>
warning: do not merge master to another branch like QA_4_1, it would<br>
damage this other branch.<br>
<br>
In the case of this fix, since it created another message, it's better<br>
to leave it only in master. That's why I did not object to your pull<br>
request targetting master.<br>
<br>
For a "normal" fix not involving a new message, we target a QA branch<br>
when doing the pull request on github.<br></blockquote><div><br></div><div>Marc,</div><div><br></div><div>Ok, I won't merge this one.</div><div>I'll just add the line in the ChangeLog file.</div><div><br></div><div>
Hugues.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
><br>
> Thanks,<br>
> Hugues.<br>
><br>
><br>
> 2013/12/2 Marc Delisle <<a href="mailto:marc@infomarc.info" target="_blank">marc@infomarc.info</a> <mailto:<a href="mailto:marc@infomarc.info" target="_blank">marc@infomarc.info</a>>><br>
<div><div>><br>
> Hugues Peccatte a écrit :<br>
> > Hi everyone,<br>
> ><br>
> > I just did my first merge of pull request linked to a bug ticket:<br>
> > <a href="https://sourceforge.net/p/phpmyadmin/bugs/4157/" target="_blank">https://sourceforge.net/p/phpmyadmin/bugs/4157/</a><br>
> > My pull request had been merged into the master.<br>
> ><br>
> > Should I merge it in any other branch ? QA_4_1 ? STABLE ? None ?<br>
> > And then, how should I close the ticket please ? I saw that you<br>
> change the<br>
> > priority to 1, set the status to "resolved" and add a prefix in the<br>
> > subject: "(ok X.X.X-YY)".<br>
><br>
> Hi Hugues,<br>
> see <a href="http://wiki.phpmyadmin.net/pma/Release_Targets" target="_blank">http://wiki.phpmyadmin.net/pma/Release_Targets</a><br>
><br>
> Normally, we should be fixing bugs in QA_4_0 (unless the bug is not<br>
> present in 4.0.x).<br>
><br>
> We do not close a ticket until the corresponding version is released.<br>
> This is to avoid duplicate reports.<br>
><br>
> ><br>
> > Shouldn't I also update the Changelog file ?<br>
> ><br>
> > Thanks,<br>
> > Hugues.<br>
> ><br>
> ><br>
> ><br>
> ><br>
> ------------------------------------------------------------------------<br>
> ><br>
> ><br>
> ------------------------------------------------------------------------------<br>
> > Rapidly troubleshoot problems before they affect your business.<br>
> Most IT<br>
> > organizations don't have a clear picture of how application<br>
> performance<br>
> > affects their revenue. With AppDynamics, you get 100% visibility<br>
> into your<br>
> > Java,.NET, & PHP application. Start your 15-day FREE TRIAL of<br>
> AppDynamics Pro!<br>
> ><br>
> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk</a><br>
> ><br>
> ><br>
> ><br>
> ------------------------------------------------------------------------<br>
> ><br>
> > _______________________________________________<br>
> > Phpmyadmin-devel mailing list<br>
> > <a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a><br>
</div></div>> <mailto:<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a>><br>
<div>> > <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
><br>
><br>
> --<br>
> Marc Delisle<br>
> <a href="http://infomarc.info" target="_blank">http://infomarc.info</a> | <a href="http://phpmyadmin.net" target="_blank">http://phpmyadmin.net</a><br>
><br>
> ------------------------------------------------------------------------------<br>
> Rapidly troubleshoot problems before they affect your business. Most IT<br>
> organizations don't have a clear picture of how application performance<br>
> affects their revenue. With AppDynamics, you get 100% visibility<br>
> into your<br>
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of<br>
> AppDynamics Pro!<br>
> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk</a><br>
> _______________________________________________<br>
> Phpmyadmin-devel mailing list<br>
> <a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a><br>
</div>> <mailto:<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a>><br>
> <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
<div><div>><br>
><br>
><br>
><br>
> ------------------------------------------------------------------------------<br>
> Rapidly troubleshoot problems before they affect your business. Most IT<br>
> organizations don't have a clear picture of how application performance<br>
> affects their revenue. With AppDynamics, you get 100% visibility into your<br>
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!<br>
> <a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk</a><br>
><br>
><br>
><br>
> _______________________________________________<br>
> Phpmyadmin-devel mailing list<br>
> <a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a><br>
> <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
><br>
<br>
<br>
--<br>
Marc Delisle<br>
<a href="http://infomarc.info" target="_blank">http://infomarc.info</a> | <a href="http://phpmyadmin.net" target="_blank">http://phpmyadmin.net</a><br>
<br>
------------------------------------------------------------------------------<br>
Rapidly troubleshoot problems before they affect your business. Most IT<br>
organizations don't have a clear picture of how application performance<br>
affects their revenue. With AppDynamics, you get 100% visibility into your<br>
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!<br>
<a href="http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk</a><br>
_______________________________________________<br>
Phpmyadmin-devel mailing list<br>
<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net" target="_blank">Phpmyadmin-devel@lists.sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
</div></div></blockquote></div><br></div></div>