Date: Fri, 18 Jul 2014 08:52:00 GMT From: op@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r271067 - soc2014/op/tools Message-ID: <201407180852.s6I8q096014383@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: op Date: Fri Jul 18 08:51:59 2014 New Revision: 271067 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271067 Log: updated tools/svn-cherry-pick-from-git.csh added git log support Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com> Modified: soc2014/op/tools/svn-cherry-pick-from-git.csh Modified: soc2014/op/tools/svn-cherry-pick-from-git.csh ============================================================================== --- soc2014/op/tools/svn-cherry-pick-from-git.csh Fri Jul 18 08:49:09 2014 (r271066) +++ soc2014/op/tools/svn-cherry-pick-from-git.csh Fri Jul 18 08:51:59 2014 (r271067) @@ -3,6 +3,7 @@ set ver=$1 set td=`mktemp -d` set opwd=${PWD} +set GIT_DIR=${opwd}/.git set svndir="/usr/data/source/svn/op/freebsd-base" git format-patch -o ${td} ${ver} @@ -10,10 +11,34 @@ cd ${svndir} foreach i ( `ls ${td}` ) + clear set i=${td}/${i} + echo "PATCH: ${i}" + set files=`sed -n -e 's/ \(.*\).*|.* [0-9]*.*$/\1/gp' ${i}` + echo "FILES: ${files}" + echo "press ENTER to continue" + $< + less ${i} patch -p1 < ${i} - svnlite commit + svnlite add ${files} + echo + echo "press ENTER to continue" + $< + set git_id=`sed -n -e '/From/s/From \([0-9a-f]*\) .*/\1/p' ${i}` + git --git-dir=${GIT_DIR} show --format="%s%n%n%b%ngit: https://github.com/opntr/opBSD/tree/op/gsoc2014/kpatch" -s ${git_id} > /tmp/svn-commit-message-${git_id}.txt + echo + cat /tmp/svn-commit-message-${git_id}.txt + echo "press ENTER to continue" + $< + svnlite commit -F /tmp/svn-commit-message-${git_id}.txt end +svnlite up + +find . -type f -name "*.orig" +echo "press ENTER to delete .orig files" +$< +find . -type f -name "*.orig" -delete + cd ${PWD}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407180852.s6I8q096014383>