X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=77bb5e2bdfd731b86c847150642429485cbd7d64;hp=1d85b6e24d457ca0fe6e96f7fbc57c7bdb50ee0a;hb=a91e33f94ee200a8e9ac80906ac46eb0ede08760;hpb=991fbce1912d07f6cc636d423fbc6ddc5560dd1c

diff --git a/all b/all
index 1d85b6e2..77bb5e2b 100755
--- a/all
+++ b/all
@@ -444,6 +444,41 @@ case "$cmd" in
 		done
 		rm -rf "$patchdir"
 		;;
+	admin-merge)
+		for d in $repos; do
+			enter "$d0/$d" verbose
+			git rev-parse "$1/$2" || continue
+			# 1. review
+			{
+				git log HEAD.."$1/$2"
+				git diff HEAD..."$1/$2"
+			} | less
+			a=
+			while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+				echo "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"
+				read -r a
+			done
+			if [ x"$a" = x"y" ]; then
+				git merge "$1/$2"
+				cd "$d0"
+				a=
+				if ! "$SELF" compile; then
+					a=n
+				fi
+				cd "$d0/$d"
+				while [ x"$a" != x"y" -a x"$a" != x"n" ]; do
+					echo "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."
+					read -r a
+				done
+				if [ x"$a" = x"y" ]; then
+					git push origin HEAD
+					git push "$1" :"$2"
+				else
+					git reset --hard HEAD@{1}
+				fi
+			fi
+		done
+		;;
 	*)
 		echo "Usage:"
 		echo "  $SELF pull"