Lines Matching +full:- +full:- +full:revert

2 #===-- merge.sh - Test the LLVM release candidates -------------------------===#
9 #===------------------------------------------------------------------------===#
13 #===------------------------------------------------------------------------===#
15 set -e
19 revert="no"
24     echo "  -proj PROJECT  The project to merge the result into"
25     echo "  -rev NUM       The revision to merge into the project"
26     echo "  -revert        Revert rather than merge the commit"
27     echo "  -srcdir        The root of the project checkout"
30 while [ $# -gt 0 ]; do
32         -rev | --rev | -r )
36         -proj | --proj | -project | --project | -p )
40         --srcdir | -srcdir | -s)
44         -h | -help | --help )
47         -revert | --revert )
48             revert="yes"
60 if [ -z "$srcdir" ]; then
64 if [ "x$rev" = "x" -o "x$proj" = "x" ]; then
71 if ! svn ls http://llvm.org/svn/llvm-project/$proj/trunk > /dev/null 2>&1 ; then
78 if [ $revert = "yes" ]; then
83 svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1
89 if [ $revert = "yes" ]; then
91     svn merge -c -$rev . || exit 1
94     svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1
99 echo svn commit -F $tempfile