update csdn mirror, add 1.0release

2014-10-10 09:51:25 +08:00 · 2014-10-10 09:51:25 +08:00 · ffabcec191
commit ffabcec191
parent d085a5cabc
1 changed files with 4 additions and 0 deletions
--- a/trunk/scripts/csdn.mirror.sh
+++ b/trunk/scripts/csdn.mirror.sh
@ -65,6 +65,10 @@ for ((;;)); do
    break
 done

+git checkout master && git merge srs.master
+ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "(master)合并github分支失败, ret=$ret"; exit $ret; fi
+ok_msg "(master)合并github分支成功"
+
 #############################################
 # branch 1.0release
 #############################################