You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2016/07/22 20:37:33 UTC
[1/2] incubator-mnemonic git commit: MNEMONIC-84: Residual branch
cannot be removed by release tool
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master abf2bad17 -> e6d80ff62
MNEMONIC-84: Residual branch cannot be removed by release tool
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/1b04a105
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/1b04a105
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/1b04a105
Branch: refs/heads/master
Commit: 1b04a10589ff92525b04f3d89ff71939a10e261d
Parents: 4195bc1
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri Jul 22 13:34:00 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri Jul 22 13:34:00 2016 -0700
----------------------------------------------------------------------
build-tools/release.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/1b04a105/build-tools/release.sh
----------------------------------------------------------------------
diff --git a/build-tools/release.sh b/build-tools/release.sh
index 05e2085..3f9ee62 100755
--- a/build-tools/release.sh
+++ b/build-tools/release.sh
@@ -26,7 +26,7 @@ usage(){
continueprompt() {
while true; do
- read -p "Do you wish to continue?" yn
+ read -p "Do you wish to continue [y/n] ? " yn
case $yn in
[Yy]* ) break;;
[Nn]* ) exit;;
@@ -56,6 +56,11 @@ if [ "${RELEASE_VERSION}" == "${NEXT_RELEASE_VERSION}" ]; then
echo "You are trying to prepare a same version candidate so going to clean up existing branch <branch-${RELEASE_VERSION}> and tag <v${RELEASE_VERSION}-incubating> if any"
continueprompt
git branch -d branch-${RELEASE_VERSION}
+ if [ $? -ne 0 ]; then
+ echo "Trying to forcedly delete existing branch <branch-${RELEASE_VERSION}>"
+ continueprompt
+ git branch -D branch-${RELEASE_VERSION}
+ fi
git push upstream --delete branch-${RELEASE_VERSION}
git tag -d v${RELEASE_VERSION}-incubating
git push upstream --delete v${RELEASE_VERSION}-incubating
[2/2] incubator-mnemonic git commit: Merge branch 'durable-computing'
Posted by ga...@apache.org.
Merge branch 'durable-computing'
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/e6d80ff6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/e6d80ff6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/e6d80ff6
Branch: refs/heads/master
Commit: e6d80ff62a169d5882ed0766621afe2ed31812e2
Parents: abf2bad 1b04a10
Author: Wang, Gang(Gary) <ga...@intel.com>
Authored: Fri Jul 22 13:35:53 2016 -0700
Committer: Wang, Gang(Gary) <ga...@intel.com>
Committed: Fri Jul 22 13:35:53 2016 -0700
----------------------------------------------------------------------
build-tools/release.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------