[Asterisk-code-review] manager: Set AMI event "Newexten" to the EVENT FLAG DIALPLAN... (asterisk[15])

Richard Mudgett asteriskteam at digium.com
Thu Sep 6 17:13:40 CDT 2018


Richard Mudgett has posted comments on this change. ( https://gerrit.asterisk.org/10037 )

Change subject: manager: Set AMI event "Newexten" to the EVENT_FLAG_DIALPLAN class
......................................................................


Patch Set 2:

> Only putting the change in 16/master sounds fair to me.
 > 
 > I'd be happy to make the change but I'm not sure how to proceed.
 > Should the same note be made in both UPGRADE.txt and CHANGES?
 > 
 > And how to please Gerrit? Start with a cherry-pick to 16, amend
 > with an updated UPGRADE.txt then abandon this original version?

* The same note should be put into UPGRADE.txt and CHANGES in the appropriate AMI section for 16.0.0 and 16 respectively.
* The 16 branch version can be cherry-picked to 16.0 in gerrit.
* The master cannot be cherry-picked in gerrit because UPGRADE.txt will conflict.  That conflict is easily resolved as there wouldn't be any change to UPGRADE.txt for master.

FYI:  The ASTERISK issue should be on a line by itself.  The "This fixes" part is redundant.

It would be easier to do the changes locally than in gerrit.
* Create a new branch off of origin/16 (git checkout -b v16_patch --track origin/16)
* cherry-pick your patch to the new branch
* Amend the patch to add the UPGRADE.txt and CHANGES note in the appropriate section for 16.0.0 and 16 respectively.  (git add -u; git commit --amend)
* Create a new branch off of origin/master (git checkout -b master_patch --track origin/master)
* cherry-pick the change from your local 16 branch (git cherry-pick v16_patch)
* Resolve the conflict by removing the change to UPGRADE.txt
* Put both reviews up to gerrit
* Cherry-pick the 16 branch version to 16.0
* Abandon the 15 branch version

See.  Nothing to it. :)


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

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: comment
Gerrit-Change-Id: I45b3119f30e4dbc17b49831f2b1a4f2c1beadafe
Gerrit-Change-Number: 10037
Gerrit-PatchSet: 2
Gerrit-Owner: lvl <digium at lvlconsultancy.nl>
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matthew Fredrickson <creslin at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: lvl <digium at lvlconsultancy.nl>
Gerrit-Comment-Date: Thu, 06 Sep 2018 22:13:40 +0000
Gerrit-HasComments: No
Gerrit-HasLabels: No
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180906/b425fc4a/attachment.html>


More information about the asterisk-code-review mailing list