<p> Attention is currently required from: George Joseph. </p>
<p>George Joseph <strong>uploaded patch set #3</strong> to this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18065">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: Refactor the earlier "basebranch" commit<br><br>Recap from earlier commit:  If you have a development branch for a<br>major project that will receive gerrit reviews it'll probably be<br>named something like "development/16/newproject" or a work branch<br>based on that "development" branch.  That will necessitate<br>setting "defaultbranch=development/16/newproject" in .gitreview.<br>The make_version script uses that variable to construct the<br>asterisk version however, which results in versions<br>like "GIT-development/16/newproject-ee582a8c7b" which is probably<br>not what you want.  It also constructs the URLs for downloading<br>external modules with that version, which will fail.<br><br>Fast-forward:<br><br>The earlier attempt at adding a "basebranch" variable to<br>.gitreview didn't work out too well in practice because changes<br>were made to .gitreview, which is a checked-in file.  So, if<br>you wanted to rebase your work branch on the base branch, rebase<br>would attempt to overwrite your .gitreview with the one from<br>the base branch and complain about a conflict.<br><br>This is a slighltly different approach that adds three methods to<br>determine the mainline branch:<br><br>1.  --- MAINLINE_BRANCH from the environment<br><br>If MAINLINE_BRANCH is already set in the environment, that will<br>be used.  This is primarily for the Jenkins jobs.<br><br>2.  --- .develvars<br><br>Instead of storing the basebranch in .gitreview, it can now be<br>stored in a non-checked-in ".develvars" file and keyed by the<br>current branch.  So, if you were working on a branch named<br>"new-feature-work" based on "development/16/new-feature" and wanted<br> to push to that branch in Gerrit but wanted to pull the external<br> modules for 16, you'd create the following .develvars file:<br><br>[branch "new-feature-work"]<br>    mainline-branch = 16<br><br>The .gitreview file would still look like:<br><br>[gerrit]<br>defaultbranch=development/16/new-feature<br><br>...which would cause any reviews pushed from "new-feature-work" to<br>go to the "development/16/new-feature" branch in Gerrit.<br><br>The key is that the .develvars file is NEVER checked in (it's been<br>added to .gitignore).<br><br>3.  --- Well Known Development Branch<br><br>If you're actually working in a branch named like<br>"development/<mainline_branch>/some-feature", the mainline branch<br>will be parsed from it.<br><br>4.  --- .gitreview<br><br>If none of the earlier conditions exist, the .gitreview<br>"defaultbranch" variable will be used just as before.<br><br>Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9<br>---<br>M .gitignore<br>M build_tools/make_version<br>M tests/CI/buildAsterisk.sh<br>M tests/CI/installAsterisk.sh<br>4 files changed, 45 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/65/18065/3</pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18065">change 18065</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/18065"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: development/16/geolocation </div>
<div style="display:none"> Gerrit-Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9 </div>
<div style="display:none"> Gerrit-Change-Number: 18065 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Attention: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newpatchset </div>