3 . ./.jprojects.sh || exit 255
6 TARGET_BRANCH="rewrites/jpa"
9 for project in ${LIST}; do
10 if [ "${project}" = "jprojects-scripts" ]
12 echo "$0: Skipping jprojects-scripts ..."
14 elif [ ! -d "${JPROJECTS_HOME}/${project}" ]
16 echo "$0: Project '${project}' does not exist."
20 echo "$0: Processing '${project}' ..."
21 cd "${JPROJECTS_HOME}/${project}"
23 # Make sure the source branch is there
24 git checkout "${SOURCE_BRANCH}" || exit 255
26 # ... and target branch
27 git checkout "${TARGET_BRANCH}" 2>&1
30 if [ "${STATUS}" = "0" ]
33 echo "$0: Merging '${SOURCE_BRANCH}' in project '${project}' ..."
34 git merge -S "${SOURCE_BRANCH}" || exit 255
36 if [ "${SWITCH_TO_SOURCE}" = "Y" ]
38 echo "$0: Switching back to '${SOURCE_BRANCH}'"
39 git checkout "${SOURCE_BRANCH}"
42 echo "$0: Project '${project}' has no branch '${TARGET_BRANCH}'."