summaryrefslogtreecommitdiff
path: root/.tools/scripts
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-29 17:18:50 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-29 17:18:50 -0300
commit79b78942e225e5acaedc5cde420c8875363d66e5 (patch)
tree2c6cebe5cdd7a1e31dc75a6cb4c0471670d85014 /.tools/scripts
parent1c605bac9856d275340a81c435cffb83e5c3ae82 (diff)
downloadserverdata-79b78942e225e5acaedc5cde420c8875363d66e5.tar.gz
serverdata-79b78942e225e5acaedc5cde420c8875363d66e5.tar.bz2
serverdata-79b78942e225e5acaedc5cde420c8875363d66e5.tar.xz
serverdata-79b78942e225e5acaedc5cde420c8875363d66e5.zip
Hum.
Diffstat (limited to '.tools/scripts')
-rwxr-xr-x.tools/scripts/init.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index b45973bf0..259f1145a 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -174,7 +174,11 @@ function do_init {
check_error $?
cd server-code/src ; git checkout master # v2018.09.23 # 2018-09-24 # s20180713?
check_error $?
+ echo "Begin diff experiment"
git diff master s20190408 > x.diff
+ ls
+ head x.diff
+ tail x.diff
git apply x.diff
check_error $?
gitclone https://gitlab.com/TMW2 evol-hercules.git evol ; cd evol ; git checkout tmw2 ; cd ..