From 9520151dde4d1849dc9d0beb367a389ed7908b17 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sat, 14 Sep 2019 19:07:30 -0300 Subject: Force server to rollback to correct version --- localserver/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/localserver/build.sh b/localserver/build.sh index 011f726..90befdd 100755 --- a/localserver/build.sh +++ b/localserver/build.sh @@ -23,6 +23,14 @@ if [ -e "./beta.patch2" ] sleep 1 cd ../../server-code git checkout -- src + echo "Rolling server back to correct version" + git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff + ls + head -n 25 x.diff + tail -n 40 x.diff + git apply --reject --whitespace=nowarn x.diff + git status + ls --recursive|grep ".rej" cd ../tools/localserver echo "Server code clean ........" sleep 1 -- cgit v1.2.3-70-g09d2