<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Apr 11, 2015 at 10:15 PM, Matthew Jordan <span dir="ltr"><<a href="mailto:mjordan@digium.com" target="_blank" onclick="window.open('https://mail.google.com/mail/?view=cm&tf=1&to=mjordan@digium.com&cc=&bcc=&su=&body=','_blank','location=yes,menubar=yes,resizable=yes,width=800,height=600');return false;">mjordan@digium.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hey everyone -<br>
<br>
As an update on the Git migration, here is the current state of the world:<br>
<br>
1. The SVN repos have been marked read-only. While you will still be<br>
able to checkout from SVN, you shouldn't commit to any of the<br>
branches. Note that even if you do, those commits won't make it into<br>
the Git repos - so it's not really a good idea to try :-)<br>
<br>
2. The project has been moved over to a Git repo under Gerrit<br>
(<a href="https://gerrit.asterisk.org" target="_blank">https://gerrit.asterisk.org</a>). You can clone the project using the<br>
instructions on the 'asterisk' repo project page:<br>
<a href="https://gerrit.asterisk.org/#/admin/projects/asterisk" target="_blank">https://gerrit.asterisk.org/#/admin/projects/asterisk</a> Thanks goes to<br>
George Joseph for quickly getting a .gitignore/.gitreview file up for<br>
review and included in the repo.<br>
<br>
3. Mirrors for the project have been set up on <a href="http://git.asterisk.org" target="_blank">git.asterisk.org</a> and<br>
Github. These mirrors are particularly useful for providing source<br>
browsing of the repo.<br>
<br>
4. A patch has been put up against 'master' to rework the source file<br>
version macros. By rework, I mostly mean "remove", although the macro<br>
itself could not be fully removed due to other features relying on the<br>
file name being registered. See <a href="https://gerrit.asterisk.org/#/c/54/" target="_blank">https://gerrit.asterisk.org/#/c/54/</a><br>
for more details.<br>
<br>
So what are some immediate next steps?<br>
<br>
1. We need to determine the best way to handle maintaining the long<br>
running branches. While rebasing is appropriate for topic branches<br>
(team branches) that closely track a mainline branch, the mainline<br>
branches are a bit different. They not only don't have ever commit<br>
merged into them (either going 'up' from 11 => 13 => master or 'down'<br>
from master => 13 => 11), but patches are highly likely to merge<br>
cleanly. ABI issues in 11/13 are a bigger concern than those in<br>
master; APIs will have changed; etc.<br>
<br>
As a result, my initial plan was to have developers cherry-pick to the<br>
mainline branches as appropriate, with the initial commit being done<br>
to 'master'. There are some downsides to this approach:<br>
a) Each cherry-pick has to be reviewed. This can make it difficult<br>
to track the reviews, as each review is completely separate from the<br>
others.<br>
b) Cherry-picks through the Gerrit UI will not always work. Folks<br>
will need to be careful when cherry-picking back to a branch that<br>
requires fixing merge conflicts, as getting the Change ID correct in<br>
such a case is important to keep all of the Gerrit reviews tied<br>
together.<br>
c) We'll be changing our process from merging 'up' branches to<br>
'down' branches. Change is scary.<br>
<br></blockquote><div><br></div><div>I'm wondering if we can do this...</div><div><br></div><div>You submit a review on the lowest target branch, using 13 as an example. The review gets reviewed and merged into 13. Once the review is closed gerrit won't allow a cherry-pick but git of course has no problems with it. So maybe we can write/obtain a hook/plugin that allows the submitter to cherry-pick the change directly into the target branch, say master, bypassing the review process, assuming a clean merge.</div><div><br></div><div>Alternative... We normally don't have access to commit to refs/head directly but what if we had a hook that allowed a commit to be merged directly IF the commit-id/change-id matched a review already approved and merged to the original branch.</div><div><br></div><div>Off to bed. :)</div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I think we're going to need some time to work through the implications<br>
of how we handle the mainline branches. I suggest hanging out in<br>
#asterisk-dev over the next few days as we work through the details.<br>
In the meantime, I've restored the TEST-Asterisk repo so folks can<br>
play around with the cherry-picking, and/or other models of branch<br>
maintenance. I certainly welcome any suggestions on the best way to<br>
make the process work.<br>
<br>
2. Russell noted in George's .gitreview/.gitignore review<br>
(<a href="https://gerrit.asterisk.org/#/c/42/" target="_blank">https://gerrit.asterisk.org/#/c/42/</a>) that we may want to include the<br>
fullname of contributors/users along with their e-mail address. I<br>
think that's a good idea, but that would mean updating our commit<br>
message template, script, and our process. Comments/suggestions<br>
welcome here on that proposal.<br>
<br>
3. The 'make update' Makefile target needs to be updated. If you have<br>
some Makefile-foo and git-foo and would like to look at that, that'd<br>
be awesome.<br>
<br>
Over the next few days, I'll be updating the Asterisk wiki pages with<br>
more information. I'll reply to this thread as that happens. If you<br>
have any questions, please don't hesitate to reply here or jump in<br>
#asterisk-dev.<br>
<br>
Thanks!<br>
<br>
Matt<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Matthew Jordan<br>
Digium, Inc. | Director of Technology<br>
445 Jan Davis Drive NW - Huntsville, AL 35806 - USA<br>
Check us out at: <a href="http://digium.com" target="_blank">http://digium.com</a> & <a href="http://asterisk.org" target="_blank">http://asterisk.org</a><br>
<br>
--<br>
_____________________________________________________________________<br>
-- Bandwidth and Colocation Provided by <a href="http://www.api-digital.com" target="_blank">http://www.api-digital.com</a> --<br>
<br>
asterisk-dev mailing list<br>
To UNSUBSCRIBE or update options visit:<br>
<a href="http://lists.digium.com/mailman/listinfo/asterisk-dev" target="_blank">http://lists.digium.com/mailman/listinfo/asterisk-dev</a><br>
</font></span></blockquote></div><br></div></div>