mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

pre_merge.sh: Better upstream string change revert

Browse source 
Change-Id: Iff217eea5b115f244bfa6e34faf35f430f638a7d
This commit is contained in:
SpiritCroc 2020-12-12 14:14:04 +01:00
parent da6547cedd
commit ac57b10968
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
post_merge.sh
View file

@ -40,10 +40,11 @@ restore_sc .github
git add -A
git commit -m "Automatic upstream merge postprocessing"
revert_last 'Automatic revert to unchanged upstream strings, pt.1' || \
read -p "Please resolve conflicts and commit, then press enter"
"$mydir"/correct_strings.sh
revert_last 'Revert "Resolve required manual intervention in german strings"'
while grep -q "wolpertinger\|schlumpfwesen" "$mydir/vector/src/main/res/values-de/strings.xml"; do
read -p "Please resolve remaining language, then press enter!"

5
pre_merge.sh
View file

@ -20,8 +20,9 @@ restore_upstream() {
fi
}
revert_last 'Resolve required manual intervention in german strings'
revert_last 'Automatic SchildiChat string correction'
# Revert Schildi's upstream string changes
git checkout `upstream_previous_tag` -- `find "$mydir/vector/src/main/res" -name strings.xml`
git commit -m "Automatic revert to unchanged upstream strings, pt.1"
# Keep in sync with post_merge.sh!
restore_upstream .github