From 95a6af77402bfc3c77a38725ecb2f39f727dad67 Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Wed, 6 Feb 2019 14:03:11 -0800 Subject: [PATCH] svn add --force everywhere to be OK with prior attempts --- release/src/main/scripts/build_release_candidate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/src/main/scripts/build_release_candidate.sh b/release/src/main/scripts/build_release_candidate.sh index 463b9573500eb..cdb51d7b24a2e 100755 --- a/release/src/main/scripts/build_release_candidate.sh +++ b/release/src/main/scripts/build_release_candidate.sh @@ -136,7 +136,7 @@ if [[ $confirmation = "y" ]]; then sha512sum ${SOURCE_RELEASE_ZIP} > ${SOURCE_RELEASE_ZIP}.sha512 # The svn commit is interactive already and can be aborted by deleted the commit msg - svn add . + svn add --force . svn commit --no-auth-cache rm -rf ~/${LOCAL_JAVA_STAGING_DIR} fi @@ -177,7 +177,7 @@ if [[ $confirmation = "y" ]]; then sha512sum apache-beam-${RELEASE}.zip > apache-beam-${RELEASE}.zip.sha512 cd .. - svn add ${PYTHON_ARTIFACTS_DIR} + svn add --force ${PYTHON_ARTIFACTS_DIR} svn status echo "Please confirm these changes are ready to commit: [y|N] " read confirmation