Repository: incubator-edgent Updated Branches: refs/heads/master be0d4b199 -> 87b33b3aa
tweak pub/merge RM scripts Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/c2638002 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/c2638002 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/c2638002 Branch: refs/heads/master Commit: c2638002655d5a2acde430f5be5bc4f2e3001a59 Parents: 99b7c8e Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Wed Dec 21 20:37:47 2016 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Wed Dec 21 20:37:47 2016 -0500 ---------------------------------------------------------------------- buildTools/common.sh | 2 ++ buildTools/merge_release.sh | 2 ++ buildTools/publish_release.sh | 2 ++ 3 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/c2638002/buildTools/common.sh ---------------------------------------------------------------------- diff --git a/buildTools/common.sh b/buildTools/common.sh index d351b33..b5371c2 100755 --- a/buildTools/common.sh +++ b/buildTools/common.sh @@ -25,6 +25,8 @@ EDGENT_ROOT_DIR=. BUNDLE_DIR=${EDGENT_ROOT_DIR}/build/release-edgent EDGENT_ASF_GIT_URL=https://git-wip-us.apache.org/repos/asf/incubator-edgent.git +EDGENT_ASF_DIST_URL=https://www.apache.org/dist/incubator/edgent +EDGENT_ASF_DIST_DYN_URL=https://www.apache.org/dyn/closer.cgi/incubator/edgent EDGENT_ASF_SVN_RELEASE_URL=https://dist.apache.org/repos/dist/release/incubator/edgent EDGENT_ASF_SVN_RC_URL=https://dist.apache.org/repos/dist/dev/incubator/edgent http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/c2638002/buildTools/merge_release.sh ---------------------------------------------------------------------- diff --git a/buildTools/merge_release.sh b/buildTools/merge_release.sh index c4b627f..ed340ab 100755 --- a/buildTools/merge_release.sh +++ b/buildTools/merge_release.sh @@ -49,6 +49,8 @@ confirm "Proceed to refresh the local master branch prior to merging?" || exit echo echo "If you proceed to merge and there are conflicts you will need to" echo "fix the conflicts and then commit the merge and push:" +echo " git status # see the conflicts" +echo " ... fix the conflicts echo " git commit -m \"merged ${RELEASE_BRANCH}\"" echo " git push origin master" echo "If you choose not to proceed you may run this script again later." http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/c2638002/buildTools/publish_release.sh ---------------------------------------------------------------------- diff --git a/buildTools/publish_release.sh b/buildTools/publish_release.sh index 572e268..607cb90 100755 --- a/buildTools/publish_release.sh +++ b/buildTools/publish_release.sh @@ -78,3 +78,5 @@ echo echo "The ASF dev and release repositories have been updated:" echo " ${EDGENT_ASF_SVN_DEV_URL}" echo " ${EDGENT_ASF_SVN_RELEASE_URL}" +echo " ${EDGENT_ASF_DIST_URL}" +echo " ${EDGENT_ASF_DIST_DYN_URL}"
