From 2d3dc8a126bd68579b3251d964a759df40fd21e4 Mon Sep 17 00:00:00 2001 From: rusefi Date: Mon, 20 Feb 2017 19:20:31 -0500 Subject: [PATCH] progress --- README.md | 2 +- misc/git2svn.bat | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d4f4804ecb..981640c3a2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ current binaries are always available at http://rusefi.com/build_server/ | Release date | Revision | Details | | ------------ | --------- | ------- | -| 02/20/2017 | ? +| 02/20/2017 | r2939 | https://github.com/rusefi/rusefi is now the official primary reporitory | | 02/18/2017 | r11565 | improvement: level1 default brown out https://sourceforge.net/p/rusefi/tickets/354/ | | 02/18/2017 | r11554 | bugfix: rusEfi console program/erase buttons fixed with ST-LINK 2.1 | | 12/09/2016 | r10991 | bugfixes, bugfixes, bugfixes & releave 1.0 diff --git a/misc/git2svn.bat b/misc/git2svn.bat index 40a6c3e0d8..771262ff7b 100644 --- a/misc/git2svn.bat +++ b/misc/git2svn.bat @@ -17,11 +17,11 @@ rem rd /s /q %RUSEFI_GIT_PATH%\java_console rem rd /s /q %RUSEFI_GIT_PATH%\unit_tests rem rd /s /q %RUSEFI_GIT_PATH%\win32_functional_tests -cp -r firmware %RUSEFI_SVN_PATH% -cp -r hardware %RUSEFI_SVN_PATH% -rem cp -r java_console %RUSEFI_GIT_PATH% -rem cp -r unit_tests %RUSEFI_GIT_PATH% -rem cp -r win32_functional_tests %RUSEFI_GIT_PATH% +cp -r firmware %RUSEFI_SVN_PATH% +rem cp -r hardware %RUSEFI_SVN_PATH% +cp -r java_console %RUSEFI_SVN_PATH% +cp -r unit_tests %RUSEFI_SVN_PATH% +cp -r win32_functional_tests %RUSEFI_SVN_PATH% rem rm -f %RUSEFI_GIT_PATH%/readme.* rem rm -f %RUSEFI_GIT_PATH%/README.* rem cp -r README.* %RUSEFI_GIT_PATH% @@ -31,7 +31,7 @@ rem cp -r readme.* %RUSEFI_GIT_PATH% rem echo Going to git copy location -rem cd %RUSEFI_GIT_PATH% +cd %RUSEFI_SVN_PATH% rem git config --global user.email "russianefi@gmail.com" rem git config --global user.name "rusEfi" @@ -40,3 +40,6 @@ rem git pull rem git add * rem git commit -a -m "auto-sync" rem git push --repo https://rusefi:PASSWORD@github.com/rusefi/rusefi + + +svn ci -m "auto-merge from github"