Changeset 52 for confman/confmanlib.sh

Timestamp:

03/30/2006 01:54:38 (6 years ago)

Author:

ccowart

Message:

Rollback corrections

File:

• confman/confmanlib.sh (modified) (4 diffs)

confman/confmanlib.sh

@@ -23 +23 @@
   local module="$1"
   svn update ${WORK_PATH}/${module}
+}
+
+# Updates the whole source tree
+function conf_update_tree {
+  svn update ${WORK_PATH}
 }
 
@@ -127 +132 @@
   local checkpoint=$2
   local chkpath="${WORK_PATH}/${REPO_CHECKPTS}/${module}/${checkpoint}"
-  svn copy ${WORK_PATH}/${module} ${chkpath}
+  local revision=`svn info ${WORK_PATH} | awk '/Last Changed Rev:/ {print $4}'`
+  echo $revision > $chkpath
+  svn add $chkpath
   local msg="Created a checkpoint, ${checkpoint} for ${module} --`whoami`"
   svn commit ${WORK_PATH}/${REPO_CHECKPTS} -m "$msg"
@@ -151 +158 @@
   local modpath="${WORK_PATH}/${module}"
   local chkpath="${WORK_PATH}/${REPO_CHECKPTS}/${module}/${checkpoint}"
-  local date revision
+  local revision
+  local date=`echo $checkpoint | sed -E 's:(....)(..)(..):\1-\2-\3:'`
 
   # Named checkpoint
-  if [ -d "${chkpath}" ] ; then
-        #svn rm $modpath
-        #svn update $modpath
-        #svn commit -m "Removing ${module} for rollback --`whoami`" $modpath
-        #svn copy $chkpath $modpath
-        #local msg="${module} has been rolled back to ${checkpoint} --`whoami`"
-        #svn commit -m "$msg" $modpath
-        echo "Sorry, no named checkpoints at this time."
-        exit 1
-  else          # Time checkpoint
-        date=`echo $checkpoint | sed -E 's:(....)(..)(..):\1-\2-\3:'`
-        if [ -z $clock ] ; then
-                svn update --revision {$date}
-        else
-                clock=`echo $clock | sed -E 's#(..)(..)#\1:\2#'`
-                svn update --revision {${date}T${clock}}
-        fi
-  fi
+  if [ -f "${chkpath}" ] ; then
+        revision=`cat $chkpath`
+  elif [ -z $clock] ; then              # Time checkpoint
+        revision="{${date}}"
+  else
+        clock=`echo $clock | sed -E 's#(..)(..)#\1:\2#'`
+        revision="{${date}T${clock}}"
+  fi
+
+  svn update --revision $revision $modpath
 }
 
@@ -249 +249 @@
   local module=$1
   svn rm ${WORK_PATH}/${module}
+  svn rm ${WORK_PATH}/${REPO_CHECKPTS}/${module}
 }