From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 01:01:12 +0000 (-0500)
Subject: Merge branch 'master' of feistymeow.org:feisty_meow into development
X-Git-Tag: 2.140.90~2^2~11
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=912af86750a158d69db7a78a0e8f6444a0d69a25;hp=484a9cfa9ad259209bca644c854d15939b6168ce;p=feisty_meow.git

Merge branch 'master' of feistymeow.org:feisty_meow into development

still working out the kinks
---

diff --git a/huffware/readme.txt b/huffware/readme.txt
index 130938de..2f298202 100644
--- a/huffware/readme.txt
+++ b/huffware/readme.txt
@@ -1,4 +1,5 @@
 
+########
 
 This folder is in active development, but it is intended to hold all of the
 LSL (linden scripting language) free and open source assets from our
@@ -19,3 +20,6 @@ huffotronic update server and client scripts to work properly.
 Also note that these products are currently licensed according to this file:
 "licenses/license--free_in_osgrid_and_personal_opensims_only_v1.9.txt"
 
+########
+
+
diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index cd47ae32..d79a73f5 100644
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -43,6 +43,7 @@ local($root) = &canonicalize("$FEISTY_MEOW_APEX");
 &backup_hierarchy($snarf_file_base, $number, $root, "infobase");
 &backup_hierarchy($snarf_file_base, $number, $root, "documentation");
 &backup_hierarchy($snarf_file_base, $number, $root, "examples");
+&backup_hierarchy($snarf_file_base, $number, $root, "experiments");
 &backup_hierarchy($snarf_file_base, $number, $root, "feisty_inits");
 &backup_hierarchy($snarf_file_base, $number, $root, "graphiq");
 &backup_hierarchy($snarf_file_base, $number, $root, "huffware");
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index be183ae1..b5ad5170 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -81,9 +81,19 @@ function do_checkin()
       # catch if the diff-index failed somehow.
       retval+=$?
 
+      local myself="$(my_branch_name)"
+      local parent="$(parent_branch_name)"
+
       # upload any changes to the upstream repo so others can see them.
-      git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-      retval+=${PIPESTATUS[0]}
+      if [ "$myself" != "$parent" ]; then
+        git push origin "$(myself)" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+        retval+=${PIPESTATUS[0]}
+      else
+        # this branch is the same as the parent, so just push.
+        git push 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+        retval+=${PIPESTATUS[0]}
+      fi
+
     fi
   else
     # nothing there.  it's not an error though.
@@ -211,9 +221,15 @@ function squash_first_few_crs()
 
 # a helpful method that reports the git branch for the current directory's
 # git repository.
-function git_branch_name()
+function my_branch_name()
 {
-  echo "$(git branch | grep \* | cut -d ' ' -f2-)"
+  echo "$(git branch | grep \* | cut -d ' ' -f2)"
+}
+
+# this reports the upstream branch for the current repo.
+function parent_branch_name()
+{
+  echo "$(git branch -vv | grep \* | cut -d ' ' -f2)"
 }
 
 # gets the latest versions of the assets from the upstream repository.
@@ -248,14 +264,18 @@ function do_update()
     if test_writeable ".git"; then
       $blatt
       retval=0
-
-      if [ "$(git_branch_name)" != "master" ]; then
-        git pull origin master 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+#      local myself="$(my_branch_name)"
+#      local parent="$(parent_branch_name)"
+#
+#      if [ "$myself" != "$parent" ]; then
+#        git pull origin "$parent" 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
+#        retval+=${PIPESTATUS[0]}
+#      else
+
+        git pull --all 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
         retval+=${PIPESTATUS[0]}
-      fi
 
-      git pull 2>&1 | grep -v "X11 forwarding request failed" | squash_first_few_crs
-      retval+=${PIPESTATUS[0]}
+#      fi
     fi
   else
     # this is not an error necessarily; we'll just pretend they planned this.