Changeset 83680 in vbox for trunk/tools/bin

Timestamp:

Apr 11, 2020 6:44:19 PM (5 years ago)

Author:

vboxsync

Message:

tools/bin/backport-*: Adding a --update-first option to update the branch before merging.

Location:

trunk/tools/bin

Files:

• backport-common.sh (modified) (3 diffs)
• backport-merge.sh (modified) (1 diff)

trunk/tools/bin/backport-common.sh

@@ -129 +129 @@
             ;;
 
+        --update-first|--update|-u)
+            MY_UPDATE_FIRST=1
+            ;;
+
         --extra)
             if test $# -eq 0; then
@@ -144 +148 @@
         # usage
         --h*|-h*|-?|--?)
-            echo "usage: $0 [--trunk-dir <dir>] [--branch <ver>] [--branch-dir <dir>] [--extra <svn-arg>] [--first-rev] rev1 [rev2..[revN]]]"
+            echo "usage: $0 [--trunk-dir <dir>] [--branch <ver>] [--branch-dir <dir>] [--extra <svn-arg>] \\"
+            echo "                   [--first-rev] [--update-first] rev1 [rev2..[revN]]]"
             echo ""
             echo "Options:"
@@ -155 +160 @@
             echo "  --first-rev, --first, -1"
             echo "    Merge only: Check that the branch does not have any pending changes."
+            echo "  --update-first, --update, -u"
+            echo "    Merge only: Update the branch before merging."
             echo "  --extra <svn-arg>"
             echo "    Additional arguments to specify to SVN."

trunk/tools/bin/backport-merge.sh

@@ -43 +43 @@
         "${MY_SVN}" status -q "${MY_BRANCH_DIR}"
         exit 1;
-    else
-        test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
     fi
+    test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
+fi
+
+#
+# Update branch if requested.
+#
+if test -n "${MY_UPDATE_FIRST}"; then
+    if ! "${MY_SVN}" update "${MY_BRANCH_DIR}" --ignore-externals; then
+        echo "error: branch updating failed..."
+        exit 1;
+    fi
+    test -z "${MY_DEBUG}" || echo "debug: Updated the branch."
 fi