From a54f5c608a8cbb4a26a51ad81fcf257773d8c488 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Mon, 13 Jul 2020 18:49:04 -0300 Subject: Rollback is no longer needed --- .tools/scripts/init.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.tools/scripts/init.sh') diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index dfb28dec4..d73932bc6 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -190,12 +190,12 @@ function do_init { # 10.0 and prior: Server s20190513 #git diff master 41b5d5e9b6f14fd26197958aec29a02858dff299 > x.diff # Current version: Server s20190819 - git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff - ls - head -n 25 x.diff - tail -n 40 x.diff - git apply --reject --whitespace=nowarn x.diff - echo "====================================== CHANGES APPLIED" + #git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff + #ls + #head -n 25 x.diff + #tail -n 40 x.diff + #git apply --reject --whitespace=nowarn x.diff + #echo "====================================== CHANGES APPLIED" git status ls --recursive|grep ".rej" echo "====================================== Continuing..." -- cgit v1.2.3-60-g2f50