Resolved merge conflict

[debcargo-conf.git] / release.sh

diff --git a/release.sh b/release.sh
index cb0ff1c5ec6beea0bbb397a1266fec9bfe2fee75..e5dd78858dad08aa401f3a4e66da050fcbfc2cb4 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -170,11 +170,10 @@ new_bin_packages="$(echo "$diff_bin_packages" | grep '^+' | sed -e 's/^+//g')"
 rm_bin_packages="$(echo "$diff_bin_packages" | grep '^-' | sed -e 's/^-//g')"
 
 show_build_notice() {
-    CRATE_FORMAT=$(echo $CRATE|sed -e "s/_/-/g")
 cat <<eof
 The recommended way to build and upload is to run something like:
 
-  cd build && ./build.sh $CRATE $VER && dput ${DEBSRC}_${DEBVER}_${DEB_HOST_ARCH}.changes && git push origin pending-$CRATE_FORMAT && git checkout - && cd -
+  cd build && ./build.sh $CRATE $VER && dput ${DEBSRC}_${DEBVER}_${DEB_HOST_ARCH}.changes && git push origin $RELBRANCH && git checkout - && cd -
 
 eof
 }
@@ -203,7 +202,11 @@ cat <<eof
 Since the source package is already in Debian and this version does not introduce
 new binaries, then you can just go ahead and directly dput the source package.
 
-  cd build && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - & git merge -
+  cd build && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge -
+
+If you want to build and test it, run:
+
+  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge - && cd -
 
 For your reference, this source package builds $(echo "$upload_bin_packages" | wc -l) binary package(s):
 $upload_bin_packages