Changeset 84267 in vbox for trunk/tools/bin/backport-merge.sh
- Timestamp:
- May 12, 2020 8:37:44 AM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tools/bin/backport-merge.sh
r83680 r84267 71 71 echo "*** Merging r${MY_REV} ..." 72 72 echo "***" 73 if [ -n "${MY_FORCE}" ]; then 74 MY_MERGE_ARGS="$MY_MERGE_ARGS--ignore-ancestry" 75 fi 73 76 if "${MY_SVN}" merge ${MY_MERGE_ARGS} "${MY_TRUNK_DIR}" "${MY_BRANCH_DIR}" -c ${MY_REV}; then 74 77 # Check for conflict.
Note:
See TracChangeset
for help on using the changeset viewer.