Fix git-svn rebase
This commit is contained in:
parent
9dbc50fb6f
commit
7c99cfc290
47
update.sh
47
update.sh
|
@ -37,8 +37,6 @@ if [ ! $MSGINIT ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SVN="$SVN co"
|
|
||||||
|
|
||||||
if [ $GIT ] && [ ! $GITSVN ]; then
|
if [ $GIT ] && [ ! $GITSVN ]; then
|
||||||
echo -e "\E[31mgit-svn is unavailable. svn will be used."; tput sgr0
|
echo -e "\E[31mgit-svn is unavailable. svn will be used."; tput sgr0
|
||||||
GIT=0
|
GIT=0
|
||||||
|
@ -52,8 +50,25 @@ echo -e "Language: \E[31m$LCODE"; tput sgr0
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
if [ ! -z $TRUNK ]; then
|
if [ ! -z $TRUNK ]; then
|
||||||
echo -e "Updating repository: \E[34mtrunk"
|
if [ -e $TRUNK/.git] || [ -e $TRUNK/.svn ]; then
|
||||||
$SVN "$REPO/$TRUNK/po" $TRUNK
|
echo -e "Updating repository: \E[34mtrunk"
|
||||||
|
if [ $GIT ] && [ $GITSVN ]; then
|
||||||
|
SVN="$GITSVN rebase"
|
||||||
|
else
|
||||||
|
SVN="$SVN update"
|
||||||
|
fi
|
||||||
|
cd $TRUNK
|
||||||
|
$SVN "$REPO/$TRUNK/po"
|
||||||
|
cd ..
|
||||||
|
else
|
||||||
|
echo -e "Downloading repository: \E[34mtrunk"
|
||||||
|
if [ $GIT ] && [ $GITSVN ]; then
|
||||||
|
SVN="$GITSVN clone"
|
||||||
|
else
|
||||||
|
SVN="$SVN checkout"
|
||||||
|
fi
|
||||||
|
$SVN "$REPO/$TRUNK/po" $TRUNK
|
||||||
|
fi
|
||||||
tput sgr0
|
tput sgr0
|
||||||
if [ ! -e "$PREFIX-$TRUNK" ]; then
|
if [ ! -e "$PREFIX-$TRUNK" ]; then
|
||||||
mkdir "$PREFIX-$TRUNK"
|
mkdir "$PREFIX-$TRUNK"
|
||||||
|
@ -61,12 +76,26 @@ if [ ! -z $TRUNK ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for BRANCH in $BRANCHES; do
|
for BRANCH in $BRANCHES; do
|
||||||
echo -e "Updating repository: \E[34m$BRANCH"
|
if [ -e $BRANCH/.git] || [ -e $BRANCH/.svn ]; then
|
||||||
$SVN "$REPO/branches/$BRANCH/po" $BRANCH
|
echo -e "Updating repository: \E[34m$BRANCH"
|
||||||
|
if [ $GIT ] && [ $GITSVN ]; then
|
||||||
|
SVN="$GITSVN rebase"
|
||||||
|
else
|
||||||
|
SVN="$SVN update"
|
||||||
|
fi
|
||||||
|
cd $BRANCH
|
||||||
|
$SVN "$REPO/$BRANCH/po"
|
||||||
|
cd ..
|
||||||
|
else
|
||||||
|
echo -e "Downloading repository: \E[34m$BRANCH"
|
||||||
|
if [ $GIT ] && [ $GITSVN ]; then
|
||||||
|
SVN="$GITSVN clone"
|
||||||
|
else
|
||||||
|
SVN="$SVN checkout"
|
||||||
|
fi
|
||||||
|
$SVN "$REPO/$BRANCH/po" $BRANCH
|
||||||
|
fi
|
||||||
tput sgr0
|
tput sgr0
|
||||||
done
|
|
||||||
|
|
||||||
for BRANCH in $BRANCHES; do
|
|
||||||
if [ ! -e "$PREFIX-$BRANCH" ]; then
|
if [ ! -e "$PREFIX-$BRANCH" ]; then
|
||||||
mkdir "$PREFIX-$BRANCH"
|
mkdir "$PREFIX-$BRANCH"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue