moving to a better name

i wanted a development branch instead of one called "develop", but now that i've been using the names a lot, development is too (*& long.  but develop bugs me.  so, to go even more compact, i've chosen dev as the real development branch.  the one called development will wither and die.

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 3c6685d67ad1fae3a2c4a4c500be88b9345e7338..291789f13d7bd852e28723721d478df5ae30ee19 100644 (file)
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -250,50 +250,16 @@ function parent_branch_name()
   echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
 }
 
-# gets the latest versions of the assets from the upstream repository.
-function do_update()
+# the git update process just gets more and more complex when you bring in
+# branches, so we've moved this here to avoid having a ton of code in the
+# do_checkin method.
+function careful_git_update()
 {
-  directory="$1"; shift
-
-  save_terminal_title
-
-  # make a nice echoer since we want to use it inside conditions below.
-  local nicedir="$directory"
-  if [ $nicedir == "." ]; then
-    nicedir=$(\pwd)
-  fi
-  local blatt="echo retrieving '$nicedir'..."
-
-  pushd "$directory" &>/dev/null
-  if [ -d "CVS" ]; then
-    if test_writeable "CVS"; then
-      $blatt
-      cvs update . | $TO_SPLITTER
-      test_or_die "cvs update"
-    fi
-  elif [ -d ".svn" ]; then
-    if test_writeable ".svn"; then
-      $blatt
-      svn update . | $TO_SPLITTER
-      test_or_die "svn update"
-    fi
-  elif [ -d ".git" ]; then
-    if test_writeable ".git"; then
-      $blatt
-
-# classic implementation, but only works with one master branch.
-# fixes will be forthcoming from development branch.
-
-#      git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
-#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
-#      test_or_die "git pull"
-
-
-#let's start over clean here...
-
-      git remote update
-      test_or_die "git remote update"
+  # first update all our remote branches to their current state from the repos.
+  git remote update
+  test_or_die "git remote update"
 
+#hmmm: this should be a function:
 # from: https://stackoverflow.com/questions/3258243/check-if-pull-needed-in-git
 UPSTREAM=$(parent_branch_name)
 #argh: original UPSTREAM='${1:-'\''@{u}'\''}'
@@ -315,16 +281,19 @@ fi
 echo The rest of pull is not being done yet.
 return 1
 
-      git pull --no-ff origin
-      test_or_die "git fetch origin"
+  # now pull down any changes in our own origin in the repo, to stay in synch
+  # with any changes from others.
+  git pull --no-ff origin
+  test_or_die "git fetch origin"
+
+
 
+# below has older shards of partial knowledge.
 
 #      reslog=$(git log HEAD..origin/master --oneline)
 #      if [[ "${reslog}" != "" ]] ; then
 #        git merge origin/master
 
-
-
 #      # from very helpful page:
 #      # https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches
 #      for remote in $( git branch -r | grep -v -- '->' ); do
@@ -339,6 +308,50 @@ return 1
 #
 #      git pull --all 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
 #      test_or_die "git pull"
+
+}
+
+# gets the latest versions of the assets from the upstream repository.
+function do_update()
+{
+  directory="$1"; shift
+
+  save_terminal_title
+
+  # make a nice echoer since we want to use it inside conditions below.
+  local nicedir="$directory"
+  if [ $nicedir == "." ]; then
+    nicedir=$(\pwd)
+  fi
+  local blatt="echo retrieving '$nicedir'..."
+
+  pushd "$directory" &>/dev/null
+  if [ -d "CVS" ]; then
+    if test_writeable "CVS"; then
+      $blatt
+      cvs update . | $TO_SPLITTER
+      test_or_die "cvs update"
+    fi
+  elif [ -d ".svn" ]; then
+    if test_writeable ".svn"; then
+      $blatt
+      svn update . | $TO_SPLITTER
+      test_or_die "svn update"
+    fi
+  elif [ -d ".git" ]; then
+    if test_writeable ".git"; then
+      $blatt
+
+# classic implementation, but only works with one master branch.
+# fixes will be forthcoming from development branch.
+
+#      git pull 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER
+#      if [ ${PIPESTATUS[0]} -ne 0 ]; then false; fi
+#      test_or_die "git pull"
+
+#any parms needed?
+      careful_git_update 
+
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.