VirtualBox

Ignore:
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!

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/bin/backport-merge.sh

    r83680 r84267  
    7171        echo "*** Merging r${MY_REV} ..."
    7272        echo "***"
     73        if [ -n "${MY_FORCE}" ]; then
     74            MY_MERGE_ARGS="$MY_MERGE_ARGS--ignore-ancestry"
     75        fi
    7376        if "${MY_SVN}" merge ${MY_MERGE_ARGS} "${MY_TRUNK_DIR}" "${MY_BRANCH_DIR}" -c ${MY_REV}; then
    7477            # Check for conflict.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette