Revision: 12279
Author: [email protected]
Date: Wed Aug 8 07:57:10 2012
Log: tools/push-to-trunk.sh: Add a check whether grepping for the
just-committed SVN revision number succeeded.
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10828210
http://code.google.com/p/v8/source/detail?r=12279
Modified:
/branches/bleeding_edge/tools/push-to-trunk.sh
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk.sh Fri Apr 13 09:00:31 2012
+++ /branches/bleeding_edge/tools/push-to-trunk.sh Wed Aug 8 07:57:10 2012
@@ -304,11 +304,22 @@
let CURRENT_STEP+=1
if [ $START_STEP -le $CURRENT_STEP ] ; then
echo ">>> Step $CURRENT_STEP: Commit to SVN."
- git svn dcommit | tee >(grep -E "^Committed r[0-9]+" \
- | sed -e 's/^Committed r\([0-9]\+\)/\1/' \
- > "$TRUNK_REVISION_FILE") \
+ git svn dcommit 2>&1 | tee >(grep -E "^Committed r[0-9]+" \
+ | sed -e 's/^Committed r\([0-9]\+\)/\1/' \
+ > "$TRUNK_REVISION_FILE") \
|| die "'git svn dcommit' failed."
TRUNK_REVISION=$(cat "$TRUNK_REVISION_FILE")
+ # Sometimes grepping for the revision fails. No idea why. If you figure
+ # out why it is flaky, please do fix it properly.
+ if [ -z "$TRUNK_REVISION" ] ; then
+ echo "Sorry, grepping for the SVN revision failed. Please look for it
in \
+the last command's output above and provide it manually (just the number, \
+without the leading \"r\")."
+ while [ -z "$TRUNK_REVISION" ] ; do
+ echo -n "> "
+ read TRUNK_REVISION
+ done
+ fi
persist "TRUNK_REVISION"
rm -f "$TRUNK_REVISION_FILE"
fi
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
