[Asterisk-code-review] build: Refactor the earlier "basebranch" commit (asterisk[16])

George Joseph asteriskteam at digium.com
Tue Feb 22 10:24:48 CST 2022


Attention is currently required from: N A, Kevin Harwell.
George Joseph has posted comments on this change. ( https://gerrit.asterisk.org/c/asterisk/+/18017 )

Change subject: build: Refactor the earlier "basebranch" commit
......................................................................


Patch Set 4:

(2 comments)

File build_tools/make_version:

https://gerrit.asterisk.org/c/asterisk/+/18017/comment/95243d62_341303d7 
PS4, Line 103:         MAINLINE_BRANCH=$(${GIT} config -f .gitreview --get gerrit.basebranch)
> Since basebranch is no longer used can it be removed from the .gitreview file too?

Yes but I wanted to do that in a separate review because if it's included here it won't cherry pick cleanly.


https://gerrit.asterisk.org/c/asterisk/+/18017/comment/529a95ed_f188f8e5 
PS4, Line 114:             # If we didn't find it, see if this is a well-known development branch.
             :             # development/<mainline_branch>/<branchname> or
             :             # devel/<mainline_branch>/<branchname>
             :             if [ "x${MAINLINE_BRANCH}" = "x" ] ; then
             :                 MAINLINE_BRANCH=$(echo "${BRANCH}" | ${SED} -n -r -e "s at devel(opment)?/([0-9]+)/.+@\2 at p")
             :             fi
> Is this a usual convention? I feel like this case can be removed. It seems specific to how a developer might create branches locally.

I'm going to document this on the wiki but Josh and I came up with the naming and for major new features it makes sense to do it in a different branch.  That way it can be merged and tested completely before it hits the mainline branches.



-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/18017
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 16
Gerrit-Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9
Gerrit-Change-Number: 18017
Gerrit-PatchSet: 4
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-Reviewer: N A <mail at interlinked.x10host.com>
Gerrit-Attention: N A <mail at interlinked.x10host.com>
Gerrit-Attention: Kevin Harwell <kharwell at digium.com>
Gerrit-Comment-Date: Tue, 22 Feb 2022 16:24:48 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: comment
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220222/f488c10e/attachment.html>


More information about the asterisk-code-review mailing list