mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 19:42:54 +02:00
Add a -revert option to utils/release/merge.sh
llvm-svn: 243929
This commit is contained in:
parent
b636b69e73
commit
e8ac7b0c34
@ -16,11 +16,13 @@ set -e
|
||||
|
||||
rev=""
|
||||
proj=""
|
||||
revert="no"
|
||||
|
||||
function usage() {
|
||||
echo "usage: `basename $0` [OPTIONS]"
|
||||
echo " -proj PROJECT The project to merge the result into"
|
||||
echo " -rev NUM The revision to merge into the project"
|
||||
echo " -revert Revert rather than merge the commit"
|
||||
}
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
@ -36,6 +38,9 @@ while [ $# -gt 0 ]; do
|
||||
-h | -help | --help )
|
||||
usage
|
||||
;;
|
||||
-revert | --revert )
|
||||
revert="yes"
|
||||
;;
|
||||
* )
|
||||
echo "unknown option: $1"
|
||||
echo ""
|
||||
@ -60,17 +65,27 @@ fi
|
||||
|
||||
tempfile=`mktemp /tmp/merge.XXXXXX` || exit 1
|
||||
|
||||
echo "Merging r$rev:" > $tempfile
|
||||
if [ $revert = "yes" ]; then
|
||||
echo "Reverting r$rev:" > $tempfile
|
||||
else
|
||||
echo "Merging r$rev:" > $tempfile
|
||||
fi
|
||||
svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
|
||||
|
||||
cd $proj.src
|
||||
echo "# Updating tree"
|
||||
svn up
|
||||
echo "# Merging r$rev into $proj locally"
|
||||
svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
|
||||
|
||||
if [ $revert = "yes" ]; then
|
||||
echo "# Reverting r$rev in $proj locally"
|
||||
svn merge -c -$rev . || exit 1
|
||||
else
|
||||
echo "# Merging r$rev into $proj locally"
|
||||
svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "# To commit the merge, run the following in $proj.src/:"
|
||||
echo "# To commit, run the following in $proj.src/:"
|
||||
echo svn commit -F $tempfile
|
||||
|
||||
exit 0
|
||||
|
Loading…
Reference in New Issue
Block a user