zmike pushed a commit to branch master. http://git.enlightenment.org/admin/release-management.git/commit/?id=919c030ae047755d0b6109dca548f789ce24fbbf
commit 919c030ae047755d0b6109dca548f789ce24fbbf Author: Mike Blumenkrantz <[email protected]> Date: Wed May 1 16:18:51 2019 -0400 add script to simplify picking patches for stable releases --- release-picker.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/release-picker.sh b/release-picker.sh new file mode 100755 index 0000000..6ed6b37 --- /dev/null +++ b/release-picker.sh @@ -0,0 +1,23 @@ +#!/bin/zsh -e + +commit_num=$1 + +echo "Starting at origin/master~${commit_num}..." + +for x in {$commit_num..0} ; do + echo "Checking origin/master~$x" + git show origin/master~$x + echo "Pick? (y/n)" + read -sk pick + if [[ "${pick:0:1}" = "y" ]] ; then + git cherry-pick origin/master~$x + if [[ $? != 0 ]] ; then + echo "BAILing at origin/master~$x for conflict merge; resume at $(($x-1))" + break + fi + else + echo + fi +done + +echo "Done!" --
