Changeset 84267 in vbox

Timestamp:

May 12, 2020 8:37:44 AM (5 years ago)

Author:

vboxsync

Message:

tools/bin/backport-*: Added --force switch to force merging/backporting. Use with caution!

Location:

trunk/tools/bin

Files:

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

trunk/tools/bin/backport-common.sh

@@ -73 +73 @@
 MY_EXTRA_ARGS=
 MY_DEBUG=
+MY_FORCE=
 
 while test $# -ge 1;
@@ -127 +128 @@
         --first-rev|--first|-1)
             MY_FIRST_REV=1
+            ;;
+
+        --force)
+            MY_FORCE=1
             ;;
 
@@ -160 +165 @@
             echo "  --first-rev, --first, -1"
             echo "    Merge only: Check that the branch does not have any pending changes."
+            echo "  --force"
+            echo "    Forces backporting, regardless of ancestry. Use with caution!"
             echo "  --update-first, --update, -u"
             echo "    Merge only: Update the branch before merging."
@@ -213 +220 @@
     exit 2;
 fi
-

trunk/tools/bin/backport-merge.sh

@@ -71 +71 @@
         echo "*** Merging r${MY_REV} ..."
         echo "***"
+        if [ -n "${MY_FORCE}" ]; then
+            MY_MERGE_ARGS="$MY_MERGE_ARGS--ignore-ancestry"
+        fi
         if "${MY_SVN}" merge ${MY_MERGE_ARGS} "${MY_TRUNK_DIR}" "${MY_BRANCH_DIR}" -c ${MY_REV}; then
             # Check for conflict.