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

[George Joseph]

Attention is currently required from: N A.
Hello N A, Friendly Automation, 

I'd like you to reexamine a change. Please visit

    https://gerrit.asterisk.org/c/asterisk/+/18017

to look at the new patch set (#2).

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

build: Refactor the earlier "basebranch" commit

The earlier attempt at adding a "basebranch" variable to
.gitreview didn't work out too well in practice because changes
were made to .gitreview, which is a checked-in file.  So, if
you wanted to rebase your work branch on the base branch, rebase
would attempt to overwrite your .gitreview with the one from
the base branch and complain about a conflict.

This is a slighltly different approach.  Instead of storing
the basebranch in .gitreview, it can now be stored in a
non-checked-in .develvars file and keyed by the current branch.

So, if you were working on development/16/something and wanted
to push to that branch in gerrit but wanted to pull the external
modules for 16, you'd create the following .develvars file:

[branch "development/16/something"]
    mainline-branch = 16

Of course you could have other things in there as well...

[branch "development/18/something"]
    mainline-branch = 18

[branch "development/19/something_new"]
    mainline-branch = 19

The key is that the .develvars file is NEVER checked in (it's been
added to .gitignore).

This commit also removes the "basebranch" entry that was added by
the earlier commit from the .gitreview file.

Change-Id: I1cdeeaa0944bba3f2e01d7a2039559d0c266f8c9
---
M .gitignore
M .gitreview
M build_tools/make_version
3 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/17/18017/2
-- 
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: 2
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: N A <mail at interlinked.x10host.com>
Gerrit-Attention: N A <mail at interlinked.x10host.com>
Gerrit-MessageType: newpatchset
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220217/e88bc56b/attachment-0001.html>