Tweaked the mergedevbranch script.

- Legacy-Id: 8977
2015-02-04 22:21:28 +00:00 · 2015-02-04 22:21:28 +00:00 · c63b037461
parent 99e3f6514c
commit c63b037461
1 changed files with 2 additions and 0 deletions
--- a/bin/mergedevbranch
+++ b/bin/mergedevbranch
@ -206,6 +206,8 @@ read -p "Continue with the commit? [Y/n] "
 [ "$REPLY" = "Y" -o  "$REPLY" = "y" -o  "$REPLY" = "" ] || ARG_COMMIT=0

 if [ "$ARG_COMMIT" != 0 ]; then
+    echo "Ensuring we're up-to-date:"
+    svn up
    echo "Committing the merge:"
    echo ""
    svn commit -m "Merged in [$rev] from $who: