VirtualBox

source: vbox/trunk/tools/bin/backport-merge.sh@ 104054

Last change on this file since 104054 was 98105, checked in by vboxsync, 23 months ago

tools/bin: Use correct hash-bang so zsh/macOS doesn't give us a 'sh' w/o the support for '-n' option in the echo command.

  • Property svn:eol-style set to LF
  • Property svn:executable set to *
  • Property svn:keywords set to Author Date Id Revision
File size: 3.5 KB
Line 
1#!/usr/bin/env kmk_ash
2# $Id: backport-merge.sh 98105 2023-01-17 15:17:40Z vboxsync $
3## @file
4# Script for merging a backport from trunk.
5#
6
7#
8# Copyright (C) 2020-2023 Oracle and/or its affiliates.
9#
10# This file is part of VirtualBox base platform packages, as
11# available from https://www.virtualbox.org.
12#
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#
28
29#
30# Determin script dir so we can source the common bits.
31#
32MY_SED=kmk_sed
33MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
34if test "${MY_SCRIPT_DIR}" = "$0"; then
35 MY_SCRIPT_DIR=`pwd -L`
36else
37 MY_SCRIPT_DIR=`cd "${MY_SCRIPT_DIR}"; pwd -L` # pwd is built into kmk_ash.
38fi
39
40#
41# This does a lot.
42#
43MY_SCRIPT_NAME="backport-merge.sh"
44. "${MY_SCRIPT_DIR}/backport-common.sh"
45
46#
47# Check that the branch is clean if first revision.
48#
49if 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
56 test -z "${MY_DEBUG}" || echo "debug: Found no pending changes on branch."
57fi
58
59#
60# Update branch if requested.
61#
62if 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."
68fi
69
70#
71# Do the merging.
72#
73MY_DONE_REVS=
74MY_FAILED_REV=
75MY_TODO_REVS=
76test -n "${MY_DEBUG}" && echo "MY_REVISIONS=${MY_REVISIONS}"
77for MY_REV in ${MY_REVISIONS};
78do
79 MY_MERGE_ARGS=
80 if test -z "${MY_FAILED_REV}"; then
81 echo "***"
82 echo "*** Merging r${MY_REV} ..."
83 echo "***"
84 if [ -n "${MY_FORCE}" ]; then
85 MY_MERGE_ARGS="$MY_MERGE_ARGS --ignore-ancestry"
86 fi
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
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
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
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
110 fi
111done
112
113if test -z "${MY_FAILED_REV}"; then
114 echo "* Successfully merged all revision (${MY_DONE_REVS})."
115 exit 0;
116fi
117if test -n "${MY_DONE_REVS}"; then
118 echo "* Successfully merged: ${MY_DONE_REVS}"
119fi
120if test -n "${MY_TODO_REVS}"; then
121 echo "* Revisions left todo: ${MY_TODO_REVS}"
122fi
123exit 1;
Note: See TracBrowser for help on using the repository browser.

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