From ebbff18f7eb4851e17e749dc56ad3ad06495fb50 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 29 Jun 2019 17:45:03 -0300
Subject: I'm not convinced this is working at all, let alone the bugs Last
test, after this, I'll delete CI again.
---
.tools/scripts/init.sh | 9 ++++++---
1 file 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 ..
--
cgit v1.2.3-70-g09d2