Fix local integration branch version string.

The branch should be made fom the local_branch to include the snapshot
commit and thus made at the end of the process.

Change-Id: I91f0309bf4202661c7f8c5f0ae558dbd99be43be

1 files changed, 13 insertions, 13 deletions

diff --git a/tcwg-release.sh b/tcwg-release.sh
index 05218e2..48c8699 100755
--- a/tcwg-release.sh
+++ b/tcwg-release.sh
@@ -791,19 +791,6 @@ pushd $REL_DIR/git 1>/dev/null
 git checkout -B ${local_branch} ${track} 2>/dev/null
 popd 1>/dev/null
 
-if [ "${SNAPSHOT:+set}" = "set" ]; then
-    print_info "${bold}Checking out branch \"${local_int_branch}\"..."
-    pushd $REL_DIR/git 1>/dev/null
-    git checkout -B ${local_int_branch} --track ${remote_int_branch} 1>/dev/null
-
-    # Bump the integration branch gcc/LINARO-VERSION
-    bump_and_dev "${bump_int_to}"
-
-    print_info "${bold}Returning to git branch \"${save_branch}\"..."
-    git checkout ${save_branch} 1>/dev/null
-    popd 1>/dev/null
-fi
-
 print_info "${bold}Creating ${SNAPSHOT:+snapshot}${RELEASE:+release}${CANDIDATE:+release candidate} ChangeLog entries..."
 
 changelog
@@ -856,6 +843,19 @@ tar cfJ gcc-linaro-${rname}.tar.xz gcc-linaro-${rname}
 md5sum gcc-linaro-${rname}.tar.xz > gcc-linaro-${rname}.tar.xz.asc
 popd 1>/dev/null
 
+if [ "${SNAPSHOT:+set}" = "set" ]; then
+    print_info "${bold}Checking out branch \"${local_int_branch}\"..."
+    pushd $REL_DIR/git 1>/dev/null
+    git checkout -B ${local_int_branch} ${local_branch} 1>/dev/null
+
+    # Bump the integration branch gcc/LINARO-VERSION
+    bump_and_dev "${bump_int_to}"
+
+    print_info "${bold}Returning to git branch \"${save_branch}\"..."
+    git checkout ${save_branch} 1>/dev/null
+    popd 1>/dev/null
+fi
+
 bump_and_dev "${bump_mode_to}"
 
 # Output the info a second time so it's all at the end of any captured logs.