summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-29 17:45:03 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-29 17:45:03 -0300
commitebbff18f7eb4851e17e749dc56ad3ad06495fb50 (patch)
treec5e637981bc77c25649a16822d0f846e16c56c73
parent3094aa1615c76671e61d4d56066adb673f63b65a (diff)
downloadserverdata-ebbff18f7eb4851e17e749dc56ad3ad06495fb50.tar.gz
serverdata-ebbff18f7eb4851e17e749dc56ad3ad06495fb50.tar.bz2
serverdata-ebbff18f7eb4851e17e749dc56ad3ad06495fb50.tar.xz
serverdata-ebbff18f7eb4851e17e749dc56ad3ad06495fb50.zip
I'm not convinced this is working at all, let alone the bugs
Last test, after this, I'll delete CI again.
-rwxr-xr-x.tools/scripts/init.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index dc333fa64..27923c6e8 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -178,9 +178,12 @@ function do_init {
cd ..
git diff master s20190408 > x.diff
ls
- head x.diff
- tail x.diff
- git apply x.diff
+ head -n 25 x.diff
+ tail -n 40 x.diff
+ git apply --reject --whitespace=nowarn x.diff
+ echo "====================================== DIFFED"
+ git status
+ echo "====================================== Continuing..."
cd src
check_error $?
gitclone https://gitlab.com/TMW2 evol-hercules.git evol ; cd evol ; git checkout tmw2 ; cd ..