diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2016-05-29 22:09:54 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2016-05-29 22:09:54 +0000 |
| commit | d703145852698e586065dc9ee5fbf5374a7d781f (patch) | |
| tree | a3c86c0cf0257c1b62b87957624e4b2cb06edc7a /utils/release | |
| parent | 8b95cd30c23f5259652a4cdea22da1e6f2fdf304 (diff) | |
Make it easier to process merges in a normal buildable directory tree by
allowing the user to specify the base directory of the checkout.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271192 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/release')
| -rwxr-xr-x | utils/release/merge.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh index cc3cda9d92f..01d807920e4 100755 --- a/utils/release/merge.sh +++ b/utils/release/merge.sh @@ -35,6 +35,10 @@ while [ $# -gt 0 ]; do shift proj=$1 ;; + --srcdir | -srcdir | -s) + shift + srcdir=$1 + ;; -h | -help | --help ) usage ;; @@ -51,6 +55,10 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$srcdir" ]; then + srcdir="$proj.src" +fi + if [ "x$rev" = "x" -o "x$proj" = "x" ]; then echo "error: need to specify project and revision" echo @@ -72,7 +80,7 @@ else fi svn log -c $rev http://llvm.org/svn/llvm-project/$proj/trunk >> $tempfile 2>&1 -cd $proj.src +cd "$srcdir" echo "# Updating tree" svn up |