Changeset 84270 in vbox for trunk/tools

Timestamp:

May 12, 2020 9:20:36 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

137899

Message:

tools/bin/backport-*: Clear MERGE_ARGS when iterating over multiple backports at once.

File:

• trunk/tools/bin/backport-merge.sh (modified) (2 diffs)

trunk/tools/bin/backport-merge.sh

@@ -67 +67 @@
 for MY_REV in ${MY_REVISIONS};
 do
+    MY_MERGE_ARGS=
     if test -z "${MY_FAILED_REV}"; then
         echo "***"
@@ -72 +73 @@
         echo "***"
         if [ -n "${MY_FORCE}" ]; then
-            MY_MERGE_ARGS="$MY_MERGE_ARGS--ignore-ancestry"
+            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