[IN_PROGRESS]Merge moorereason:docs1648 into master

[spf13]

No description provided.

[moorereason]

Am I going about this the wrong way? I was going to resubmit the changes to master in a separate PR. What's the preferred workflow here?

[anthonyfok]

Hi @spf13,

I modified the prdocs bash function that you gave me so that cherry-picking from #1695 (which was based against v0.15.docs rather than master) works with prdocs-from-v0.15.docs-branch 1695:

function prdocs-from-v0.15.docs-branch() {
    if [ $# -lt 1 ]
    then
        echo "Error! Missing Pull Request ID #."
    else

        target="master"
        docs="v0.15.docs"
        cur=`git rev-parse --abbrev-ref HEAD`
        git fetch origin refs/pull/$1/head:PR-$1;
        git checkout PR-$1;

        commitcount=`git log --cherry-pick --oneline --reverse $docs..PR-$1 | wc -l | sed -e 's/^ *//' -e 's/ *$//'`
        echo -e "\n**** Attempting to cherry pick $commitcount commits ****\n "
        for sha in `git log --cherry-pick --oneline --reverse $docs..PR-$1 | awk '{print $1}'`; do
            git checkout $target;
            git cherry-pick $sha
            git checkout $docs
            git cherry-pick $sha
        done

        git branch -D PR-$1;
        git checkout $cur
    fi
}

[github-actions]

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.