Changeset 10950

Timestamp:

11/29/11 07:56:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 10948M

File:

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

issm/trunk/scripts/SyncBranches.sh

@@ -22 +22 @@
 #        svn commit -m "Block revision X from being merged into trunk-jpl"
 
-STEP=1
+STEP=3
 LASTMERGEREVISION=10943
 
@@ -47 +47 @@
         cd $PREFIX/trunk-jpl
         svn merge -r $LASTMERGEREVISION:HEAD ../trunk
+        svn commit -m "merged trunk and trunk-jpl"
 fi
 if [ "$STEP" -eq "3" ];