From 82e270fc82b6f39dc5bd55838adfb94566eb793e Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 10 Jan 2020 12:29:54 +0000 Subject: [PATCH] Added a check for uncomitted changes to bin/mergedevbranch. - Legacy-Id: 17213 --- bin/mergedevbranch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/mergedevbranch b/bin/mergedevbranch index 5d24b46e9..ae7f11f44 100755 --- a/bin/mergedevbranch +++ b/bin/mergedevbranch @@ -142,6 +142,14 @@ if grep "@$rev $branch" $mergelog; then die "Changeset $branch@$rev is already i note "Will attempt merge from $branch@$rev" +# "Check there's no uncommitted changes ..." +echo "" +$do svn st | grep "^[AMGRD] " && { + echo "" + read -p "There are uncommitted changes. Really do merge? [y/N] " + [ "$REPLY" = "Y" -o "$REPLY" = "y" ] || exit +} + note "Extract who and what:" info=$(svn log ${repo}/ -r $rev --incremental) set $(echo "$info" | tail -n +2 | head -n 1 | tr "|" "\t")