Changeset 83679 in vbox for trunk/tools/bin/backport-merge.sh

Timestamp:

Apr 11, 2020 6:37:52 PM (5 years ago)

Author:

vboxsync

Message:

tools/bin/backport-*: Adding a --first-rev option to check that the branch is empty.

File:

• trunk/tools/bin/backport-merge.sh (modified) (1 diff)

trunk/tools/bin/backport-merge.sh

@@ -33 +33 @@
 MY_SCRIPT_NAME="backport-merge.sh"
 . "${MY_SCRIPT_DIR}/backport-common.sh"
+
+#
+# Check that the branch is clean if first revision.
+#
+if test -n "${MY_FIRST_REV}"; then
+    MY_STATUS=`"${MY_SVN}" status -q "${MY_BRANCH_DIR}"`
+    if test -n "${MY_STATUS}"; then
+        echo "error: Branch already has changes pending..."
+        "${MY_SVN}" status -q "${MY_BRANCH_DIR}"
+        exit 1;
+    else
+        test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
+    fi
+fi
 
 #