Flectra/flectra_community
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add condition for switzerland

Browse Source
This commit is contained in:
Lukas Ziegler 2022-03-19 12:23:20 +01:00
parent afd87ea949
commit d33d30be97
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gather.sh
View File

@ -16,22 +16,25 @@ for i in {1..3}; do
echo ${name} echo ${name}
echo ${url} echo ${url}
git remote add $name $url if [ $name != 'l10n_switzerland' ]
git fetch $name then
git checkout 2.0 git remote add $name $url
git merge --no-edit --allow-unrelated-histories $name/2.0 git fetch $name
git checkout 2.0-fixed git checkout 2.0
git merge --no-edit --allow-unrelated-histories $name/2.0-fixed git merge --no-edit --allow-unrelated-histories $name/2.0
git checkout 2.0-upstream git checkout 2.0-fixed
git merge --no-edit --allow-unrelated-histories $name/2.0-upstream git merge --no-edit --allow-unrelated-histories $name/2.0-fixed
git checkout 1.0 git checkout 2.0-upstream
git merge --no-edit --allow-unrelated-histories $name/1.0 git merge --no-edit --allow-unrelated-histories $name/2.0-upstream
git checkout 1.0-fixed git checkout 1.0
git merge --no-edit --allow-unrelated-histories $name/1.0-fixed git merge --no-edit --allow-unrelated-histories $name/1.0
git checkout 1.0-upstream git checkout 1.0-fixed
git merge --no-edit --allow-unrelated-histories $name/1.0-upstream git merge --no-edit --allow-unrelated-histories $name/1.0-fixed
git remote remove $name git checkout 1.0-upstream
git gc --prune=now git merge --no-edit --allow-unrelated-histories $name/1.0-upstream
git remote remove $name
git gc --prune=now
fi
done done
done done
git push --all git push --all