diff options
| author | Bill Wendling <isanbard@gmail.com> | 2011-10-16 20:59:25 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2011-10-16 20:59:25 +0000 |
| commit | ef22c60abd2a6290aa42318e575f913dbe66a09d (patch) | |
| tree | 90a8d35c21fc97c608b5328fda72ff5c441cb822 | |
| parent | a6b6566db69c7db6a71a9cd79b21699b2534a78d (diff) | |
| download | bcm5719-llvm-ef22c60abd2a6290aa42318e575f913dbe66a09d.tar.gz bcm5719-llvm-ef22c60abd2a6290aa42318e575f913dbe66a09d.zip | |
Update the tree before applying patch.
llvm-svn: 142155
| -rwxr-xr-x | llvm/utils/release/merge.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh index a6b716e3d32..2cf39b282a7 100755 --- a/llvm/utils/release/merge.sh +++ b/llvm/utils/release/merge.sh @@ -64,6 +64,8 @@ echo "Merging r$rev:" > $tempfile 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" svn merge -c $rev https://llvm.org/svn/llvm-project/$proj/trunk . || exit 1 echo "# Committing changes" |
