From: Rudolf Polzer Date: Thu, 22 Apr 2010 18:38:44 +0000 (+0200) Subject: admin-merge: also do a test compile ;) X-Git-Tag: xonotic-v0.1.0preview~488 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=ebd8334087189f3da26b77c689dc49d022e339ee;ds=sidebyside admin-merge: also do a test compile ;) --- diff --git a/all b/all index 7b882074..a5e00520 100755 --- a/all +++ b/all @@ -460,6 +460,9 @@ case "$cmd" in done if [ x"$a" = x"y" ]; then git merge "$1/$2" + cd "$d0" + "$SELF" compile + cd "$d0/d" git push origin HEAD git push "$1" :"$2" fi