Changeset 10963

Timestamp:

11/29/11 08:16:32 (13 years ago)

Author:

Mathieu Morlighem

Message:

Better script

File:

• issm/SyncBranches.sh (modified) (2 diffs)

issm/SyncBranches.sh

@@ -22 +22 @@
 #        svn commit -m "Block revision X from being merged into trunk-jpl"
 
-STEP=4
-LASTMERGEREVISION=10943
+STEP=1
+LASTMERGEREVISION=10960
 
-#Check user
+#Check user and get PATH
 if [[ $(users) != "morlighe" ]]; then
         echo "you are not allowed to synchronize trunk and trunk-jpl" && exit 1 
 fi
-
-#get paths
-CURRENTPATH=$(pwd)
-cd ../..
 PREFIX=$(pwd)
-cd $CURRENTPATH
 
 if [ "$STEP" -eq "1" ]; then
@@ -53 +48 @@
         echo "--- Step 3: reintegrate trunk-jpl in trunk ---"
         cd $PREFIX/trunk
-        svn up
+        svn update
         B=$(svnversion .)
         svn merge --reintegrate https://issm.ess.uci.edu:80/svn/issm/issm/trunk-jpl