[83611] | 1 | # !kmk_ash
|
---|
| 2 | # $Id: backport-merge.sh 98103 2023-01-17 14:15:46Z vboxsync $
|
---|
| 3 | ## @file
|
---|
| 4 | # Script for merging a backport from trunk.
|
---|
| 5 | #
|
---|
| 6 |
|
---|
| 7 | #
|
---|
[98103] | 8 | # Copyright (C) 2020-2023 Oracle and/or its affiliates.
|
---|
[83611] | 9 | #
|
---|
[96407] | 10 | # This file is part of VirtualBox base platform packages, as
|
---|
| 11 | # available from https://www.virtualbox.org.
|
---|
[83611] | 12 | #
|
---|
[96407] | 13 | # This program is free software; you can redistribute it and/or
|
---|
| 14 | # modify it under the terms of the GNU General Public License
|
---|
| 15 | # as published by the Free Software Foundation, in version 3 of the
|
---|
| 16 | # License.
|
---|
| 17 | #
|
---|
| 18 | # This program is distributed in the hope that it will be useful, but
|
---|
| 19 | # WITHOUT ANY WARRANTY; without even the implied warranty of
|
---|
| 20 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
---|
| 21 | # General Public License for more details.
|
---|
| 22 | #
|
---|
| 23 | # You should have received a copy of the GNU General Public License
|
---|
| 24 | # along with this program; if not, see <https://www.gnu.org/licenses>.
|
---|
| 25 | #
|
---|
| 26 | # SPDX-License-Identifier: GPL-3.0-only
|
---|
| 27 | #
|
---|
[83611] | 28 |
|
---|
| 29 | #
|
---|
| 30 | # Determin script dir so we can source the common bits.
|
---|
| 31 | #
|
---|
| 32 | MY_SED=kmk_sed
|
---|
| 33 | MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
|
---|
| 34 | if test "${MY_SCRIPT_DIR}" = "$0"; then
|
---|
| 35 | MY_SCRIPT_DIR=`pwd -L`
|
---|
| 36 | else
|
---|
| 37 | MY_SCRIPT_DIR=`cd "${MY_SCRIPT_DIR}"; pwd -L` # pwd is built into kmk_ash.
|
---|
| 38 | fi
|
---|
| 39 |
|
---|
| 40 | #
|
---|
| 41 | # This does a lot.
|
---|
| 42 | #
|
---|
| 43 | MY_SCRIPT_NAME="backport-merge.sh"
|
---|
| 44 | . "${MY_SCRIPT_DIR}/backport-common.sh"
|
---|
| 45 |
|
---|
| 46 | #
|
---|
[83679] | 47 | # Check that the branch is clean if first revision.
|
---|
| 48 | #
|
---|
| 49 | if test -n "${MY_FIRST_REV}"; then
|
---|
| 50 | MY_STATUS=`"${MY_SVN}" status -q "${MY_BRANCH_DIR}"`
|
---|
| 51 | if test -n "${MY_STATUS}"; then
|
---|
| 52 | echo "error: Branch already has changes pending..."
|
---|
| 53 | "${MY_SVN}" status -q "${MY_BRANCH_DIR}"
|
---|
| 54 | exit 1;
|
---|
| 55 | fi
|
---|
[83680] | 56 | test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
|
---|
[83679] | 57 | fi
|
---|
| 58 |
|
---|
| 59 | #
|
---|
[83680] | 60 | # Update branch if requested.
|
---|
| 61 | #
|
---|
| 62 | if test -n "${MY_UPDATE_FIRST}"; then
|
---|
| 63 | if ! "${MY_SVN}" update "${MY_BRANCH_DIR}" --ignore-externals; then
|
---|
| 64 | echo "error: branch updating failed..."
|
---|
| 65 | exit 1;
|
---|
| 66 | fi
|
---|
| 67 | test -z "${MY_DEBUG}" || echo "debug: Updated the branch."
|
---|
| 68 | fi
|
---|
| 69 |
|
---|
| 70 | #
|
---|
[83611] | 71 | # Do the merging.
|
---|
| 72 | #
|
---|
| 73 | MY_DONE_REVS=
|
---|
| 74 | MY_FAILED_REV=
|
---|
| 75 | MY_TODO_REVS=
|
---|
| 76 | test -n "${MY_DEBUG}" && echo "MY_REVISIONS=${MY_REVISIONS}"
|
---|
| 77 | for MY_REV in ${MY_REVISIONS};
|
---|
| 78 | do
|
---|
[84270] | 79 | MY_MERGE_ARGS=
|
---|
[83668] | 80 | if test -z "${MY_FAILED_REV}"; then
|
---|
[83611] | 81 | echo "***"
|
---|
| 82 | echo "*** Merging r${MY_REV} ..."
|
---|
| 83 | echo "***"
|
---|
[84267] | 84 | if [ -n "${MY_FORCE}" ]; then
|
---|
[84270] | 85 | MY_MERGE_ARGS="$MY_MERGE_ARGS --ignore-ancestry"
|
---|
[84267] | 86 | fi
|
---|
[83611] | 87 | if "${MY_SVN}" merge ${MY_MERGE_ARGS} "${MY_TRUNK_DIR}" "${MY_BRANCH_DIR}" -c ${MY_REV}; then
|
---|
| 88 | # Check for conflict.
|
---|
| 89 | MY_CONFLICTS=`"${MY_SVN}" status "${MY_BRANCH_DIR}" | "${MY_SED}" -n -e '/^C/p'`
|
---|
| 90 | if test -z "${MY_CONFLICTS}"; then
|
---|
[83678] | 91 | if test -z "${MY_DONE_REVS}"; then
|
---|
| 92 | MY_DONE_REVS=${MY_REV}
|
---|
| 93 | else
|
---|
| 94 | MY_DONE_REVS="${MY_DONE_REVS} ${MY_REV}"
|
---|
| 95 | fi
|
---|
[83611] | 96 | else
|
---|
| 97 | echo '!!!'" Have conflicts after merging ${MY_REV}."
|
---|
| 98 | MY_FAILED_REV=${MY_REV}
|
---|
| 99 | fi
|
---|
| 100 | else
|
---|
| 101 | echo '!!!'" Failed merging r${MY_REV}."
|
---|
| 102 | MY_FAILED_REV=${MY_REV}
|
---|
| 103 | fi
|
---|
| 104 | else
|
---|
[83678] | 105 | if test -z "${MY_TODO_REVS}"; then
|
---|
| 106 | MY_TODO_REVS=${MY_REV}
|
---|
| 107 | else
|
---|
| 108 | MY_TODO_REVS="${MY_TODO_REVS} ${MY_REV}"
|
---|
| 109 | fi
|
---|
[83611] | 110 | fi
|
---|
| 111 | done
|
---|
| 112 |
|
---|
| 113 | if test -z "${MY_FAILED_REV}"; then
|
---|
| 114 | echo "* Successfully merged all revision (${MY_DONE_REVS})."
|
---|
| 115 | exit 0;
|
---|
| 116 | fi
|
---|
| 117 | if test -n "${MY_DONE_REVS}"; then
|
---|
| 118 | echo "* Successfully merged: ${MY_DONE_REVS}"
|
---|
| 119 | fi
|
---|
| 120 | if test -n "${MY_TODO_REVS}"; then
|
---|
| 121 | echo "* Revisions left todo: ${MY_TODO_REVS}"
|
---|
| 122 | fi
|
---|
| 123 | exit 1;
|
---|