diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-07-13 18:49:04 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-07-13 18:49:04 -0300 |
| commit | a54f5c608a8cbb4a26a51ad81fcf257773d8c488 (patch) | |
| tree | 707133cf87c96eb5ee8ce03538e41f23b99c59d4 /.tools | |
| parent | d5ec202c38e93f956970659fed3ccc15881f16c0 (diff) | |
| download | serverdata-a54f5c608a8cbb4a26a51ad81fcf257773d8c488.tar.gz serverdata-a54f5c608a8cbb4a26a51ad81fcf257773d8c488.tar.bz2 serverdata-a54f5c608a8cbb4a26a51ad81fcf257773d8c488.tar.xz serverdata-a54f5c608a8cbb4a26a51ad81fcf257773d8c488.zip | |
Rollback is no longer needed
Diffstat (limited to '.tools')
| -rwxr-xr-x | .tools/scripts/init.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index dfb28dec4..d73932bc6 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -190,12 +190,12 @@ function do_init { # 10.0 and prior: Server s20190513 #git diff master 41b5d5e9b6f14fd26197958aec29a02858dff299 > x.diff # Current version: Server s20190819 - git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff - ls - head -n 25 x.diff - tail -n 40 x.diff - git apply --reject --whitespace=nowarn x.diff - echo "====================================== CHANGES APPLIED" + #git diff master ce2dbb6acdc559ec256d1f9f9a779b8283064708 > x.diff + #ls + #head -n 25 x.diff + #tail -n 40 x.diff + #git apply --reject --whitespace=nowarn x.diff + #echo "====================================== CHANGES APPLIED" git status ls --recursive|grep ".rej" echo "====================================== Continuing..." |