summaryrefslogtreecommitdiff
path: root/.tools
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-29 16:57:04 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-29 16:57:04 -0300
commit1c605bac9856d275340a81c435cffb83e5c3ae82 (patch)
tree9f459e64b26e6845cab534898268fe1097f8e593 /.tools
parent8b29f94754c87b013d5e758afe13e93524ae16fa (diff)
downloadserverdata-1c605bac9856d275340a81c435cffb83e5c3ae82.tar.gz
serverdata-1c605bac9856d275340a81c435cffb83e5c3ae82.tar.bz2
serverdata-1c605bac9856d275340a81c435cffb83e5c3ae82.tar.xz
serverdata-1c605bac9856d275340a81c435cffb83e5c3ae82.zip
Attempt to reintroduce pipelines
This reverts commit 9fb384227526eef2292d0348c6bdd589ca63daa9.
Diffstat (limited to '.tools')
-rwxr-xr-x.tools/scripts/init.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index ed2179125..b45973bf0 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -174,6 +174,9 @@ function do_init {
check_error $?
cd server-code/src ; git checkout master # v2018.09.23 # 2018-09-24 # s20180713?
check_error $?
+ git diff master s20190408 > x.diff
+ git apply x.diff
+ check_error $?
gitclone https://gitlab.com/TMW2 evol-hercules.git evol ; cd evol ; git checkout tmw2 ; cd ..
check_error $?
cd ../..