<html><body><div style="color:#000; background-color:#fff; font-family:HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif;font-size:16px"><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><span id="yui_3_16_0_1_1424787078388_2583">Dan I know I had brought up using github in the past. It's been about a year, so thought its time to bring it up again.</span></div><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><br></div><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><span id="yui_3_16_0_1_1424787078388_2584">I work for a very large internet company who has recently, amongs other (buzzword alert) Continuous Integration/Continuous Delivery initiatives, has migrated entirely to a private github. </span></div><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><span id="yui_3_16_0_1_1424787078388_2629">I must say that it has been well received and one of the better and smoother internal tech migrations that we have done.</span></div><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><span><br></span></div><div id="yui_3_16_0_1_1424787078388_2531" dir="ltr"><span id="yui_3_16_0_1_1424787078388_2634"><b id="yui_3_16_0_1_1424787078388_2733">+1 for moving chirp github</b></span></div><div id="yui_3_16_0_1_1424787078388_2630"><br></div><div dir="ltr" id="yui_3_16_0_1_1424787078388_2631">right now most popular SCM, "everyone already knows how to use it"<br></div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr">nice built in code review tools for discussing/evolving a patch/feature (i.e., pull requests)</div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr">fork-and-pull collaboration pattern is very chirp friendly and permissive - while keeping control over main chirp repo</div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr">nice api support to hook into your existing build, test, and publish pipelines. (Can enforce style, commit message structure, trigger your build systems, etc)</div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr">very easy and straightforward to work on new feature branches for major changes like Zach's or Kosta's UI work, without disturbing master branch until everyone is ready. </div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr">better ui ;)</div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr"><br></div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr"><a href="https://codio.com/blog/2013/06/moving-from-mercurial-to-git/" id="yui_3_16_0_1_1424787078388_2901">https://codio.com/blog/2013/06/moving-from-mercurial-to-git/</a><br></div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr"><br></div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr"><br></div><div id="yui_3_16_0_1_1424787078388_2688" dir="ltr"><br></div> <div style="font-family: HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 16px;" id="yui_3_16_0_1_1424787078388_2638"> <div style="font-family: HelveticaNeue, Helvetica Neue, Helvetica, Arial, Lucida Grande, sans-serif; font-size: 16px;" id="yui_3_16_0_1_1424787078388_2637"> <div dir="ltr" id="yui_3_16_0_1_1424787078388_2636"> <hr size="1" id="yui_3_16_0_1_1424787078388_2818"> <font size="2" face="Arial" id="yui_3_16_0_1_1424787078388_2635"> <b><span style="font-weight:bold;">From:</span></b> Zach Welch <zach@mandolincreekfarm.com><br> <b><span style="font-weight: bold;">To:</span></b> chirp_devel@intrepid.danplanet.com <br> <b><span style="font-weight: bold;">Sent:</span></b> Monday, February 23, 2015 11:44 PM<br> <b><span style="font-weight: bold;">Subject:</span></b> Re: [chirp_devel] git vs hg patches [was: [PATCH 1/4] chirp.py: add --list-radios option (#2343)]<br> </font> </div> <div class="y_msg_container" id="yui_3_16_0_1_1424787078388_2639"><br>On 02/23/2015 03:27 PM, Dan Smith wrote:<br>...<br>> Can you send these in mercurial native format? That way I can just<br>> import them into the repo and they're properly stamped with your name,<br>> commit message, etc.<br><br>If that's strictly necessary, I could. I haven't used mercurial for a <br>great many years, but I use git on a daily basis. Thus, I used hg-git <br>to create a git repository that I could use for my chirp development. I <br>used git to format and post my patches, and I figured that would be <br>sufficient for importing into mercurial. Apparently not.<br><br>On the bright side, the problem may have been solved for us:<br><br> <br><a href="https://github.com/mozilla/moz-git-tools/blob/master/git-patch-to-hg-patch" target="_blank">https://github.com/mozilla/moz-git-tools/blob/master/git-patch-to-hg-patch</a><br><br>Will that script give you some joy? After testing it here, I can see it <br>will need a small tweak to remove [PATCH x/n] (not just [PATCH]), but <br>that should be fairly easy for someone well-versed in Python. There may <br>be other gotchas that I don't see, so let me know what you think about it.<br><br>Honestly, I would really love to avoid learning mercurial right now. <br>Isn't it enough that I'm learning Python? ;)<br><br>> Also, you need a bug in the commit message or I physically can't put it<br>> into the repo. See this for more details:<br><br>The bug number is in the Subject line of all of my patches, which <br>becomes the first line of the commit message when using git. Will that <br>work (after the above conversion) for mercurial, or do I need to put it <br>in the body of the message proper?<br><br>Thanks,<br>-- <br>Zach Welch<br>Mandolin Creek Farm<br>www.mandolincreekfarm.com<br>farm: 541-453-4131<br>cell: 541-740-3410<br>_______________________________________________<br>chirp_devel mailing list<br><a ymailto="mailto:chirp_devel@intrepid.danplanet.com" href="mailto:chirp_devel@intrepid.danplanet.com">chirp_devel@intrepid.danplanet.com</a><br><a href="http://intrepid.danplanet.com/mailman/listinfo/chirp_devel" target="_blank">http://intrepid.danplanet.com/mailman/listinfo/chirp_devel</a><br>Developer docs: <a href="http://chirp.danplanet.com/projects/chirp/wiki/Developers" target="_blank">http://chirp.danplanet.com/projects/chirp/wiki/Developers</a><br><br><br></div> </div> </div> </div></body></html>