[Asterisk-code-review] app_mf: Add full tech-agnostic MF support (asterisk[master])

[George Joseph]

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

Change subject: app_mf: Add full tech-agnostic MF support
......................................................................


Patch Set 3:

(1 comment)

File apps/app_mf.c:

https://gerrit.asterisk.org/c/asterisk/+/16483/comment/89ae1379_9454edf7 
PS3, Line 1: /*
> Is there an easy way to do this from within Gerrit (e.g. […]
I don't think you can do it in gerrit but you can do it easily locally.

Get your master branch up to date:
git checkout master
git pull

Checkout your work branch for this patch series and rebase it on master
to pick up the first patch which was already merged:
git checkout <work branch>
git rebase master

Now you're at the SF commit.  Fix the line endings and amend that commit:
dos2unix apps/app_mf.c
git commit -a --amend --no-edit

Copy and save the new commit hash for the SF commit.

Now reset back one commit to get to the MF one:
git reset --hard HEAD~1

Change the line endings back to unix and ammend the commit.
dos2unix apps/app_mf.c
git commit -a --amend --no-edit

Now cherry-pick the SF commit back into the branch:
git cherry-pick <SF-commit-hash>

You may have to resolve a conflict or two in app_mf.  Once you've done that, push the results back up to gerrit.



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

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I90cd3d401cf2ea81d3ea96fceba296be543aabb1
Gerrit-Change-Number: 16483
Gerrit-PatchSet: 3
Gerrit-Owner: N A <mail at interlinked.x10host.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Attention: N A <mail at interlinked.x10host.com>
Gerrit-Comment-Date: Thu, 16 Sep 2021 13:33:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: N A <mail at interlinked.x10host.com>
Comment-In-Reply-To: George Joseph <gjoseph at digium.com>
Gerrit-MessageType: comment
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210916/bec8197c/attachment-0001.html>