Changeset 10983

Timestamp:

11/29/11 19:31:50 (13 years ago)

Author:

Eric.Larour

Message:

Updating oecreview scripts. Thanks Mathieu.

Location:

issm/oecreview

Files:

• LastMerge (added)
• SyncBranches.sh (modified) (2 diffs)

issm/oecreview/SyncBranches.sh

@@ -23 +23 @@
 
 STEP=1
-LASTMERGEREVISION=10960
+LASTMERGEREVISION=`cat LastMerge`
 
 #Check user and get PATH
-if [[ $(users) != "morlighe" ]]; then
+if [[ $USER != "larour" ]]; then
         echo "you are not allowed to synchronize trunk and trunk-jpl" && exit 1 
 fi
@@ -58 +58 @@
         cd $PREFIX/trunk-jpl
         X=$(svnversion . | sed -e "s/:/ /" | awk {'print $2'})
+        echo $X > ../oecreview/LastMerge
         svn merge --record-only -c $X ../trunk
         svn commit -m "Block revision $X from being merged into trunk-jpl"