VirtualBox

source: vbox/trunk/tools/bin/backport-merge-and-commit.sh@ 87119

Last change on this file since 87119 was 83611, checked in by vboxsync, 5 years ago

Forward r137018 & r137019 from 6.1: tools/bin/backport-*.sh: Experimental backporting helper scripts.

  • Property svn:eol-style set to LF
  • Property svn:executable set to *
  • Property svn:keywords set to Author Date Id Revision
File size: 1.1 KB
Line 
1# !kmk_ash
2# $Id: backport-merge-and-commit.sh 83611 2020-04-07 17:11:42Z vboxsync $
3## @file
4# Script for merging and commit a backport from trunk.
5#
6
7#
8# Copyright (C) 2020 Oracle Corporation
9#
10# This file is part of VirtualBox Open Source Edition (OSE), as
11# available from http://www.virtualbox.org. This file is free software;
12# you can redistribute it and/or modify it under the terms of the GNU
13# General Public License (GPL) as published by the Free Software
14# Foundation, in version 2 as it comes in the "COPYING" file of the
15# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
16# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
17#
18
19#
20# Determin script dir so we can invoke the two worker scripts.
21#
22MY_SED=kmk_sed
23MY_SCRIPT_DIR=`echo "$0" | "${MY_SED}" -e 's|\\\|/|g' -e 's|^\(.*\)/[^/][^/]*$|\1|'` # \ -> / is for windows.
24if test "${MY_SCRIPT_DIR}" = "$0"; then
25 MY_SCRIPT_DIR=`pwd -L`
26else
27 MY_SCRIPT_DIR=`cd "${MY_SCRIPT_DIR}"; pwd -L` # pwd is built into kmk_ash.
28fi
29
30#
31# Merge & commit.
32#
33set -e
34"${MY_SCRIPT_DIR}/backport-merge.sh" $*
35echo
36"${MY_SCRIPT_DIR}/backport-commit.sh" $*
37
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