summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 ..