Merge branch 'release-2.140.119'

pulling in nice change in release script

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 0edd66d7c0e7cf08f90b6366ea994aab06b4b28c..8e59600b2a0cfbd0ad9a92165301ffaf67e92cd7 100644 (file)
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -3,7 +3,7 @@
 # specifies the version of the code that is being constructed here.
 major=2
 minor=140
-revision=118
+revision=119
 build=420
 
 # specifies the remainder of the version record info.

diff --git a/scripts/rev_control/quick_git_release.sh b/scripts/rev_control/quick_git_release.sh
index 654b0aba854dbee9c4dee073738293eaecacfd16..e70853dc2d48002205d5ac667e151a426577be2e 100644 (file)
--- a/scripts/rev_control/quick_git_release.sh
+++ b/scripts/rev_control/quick_git_release.sh
@@ -40,11 +40,23 @@ branch name and release tag name of the new release.
   # make a new branch for the release based on the dev branch.
 echo about to git checkout--hit enter
 read line
+
+  # make sure we're working on the dev branch, since that's where our releases come from.
+  git checkout dev
+  exit_on_error checking out the dev branch
+
+  # inflate all the git branches we might need, getting all their latest.
+  rpuffer
+  exit_on_error running rpuffer on the dev branch to update it
+
+  # branch off our new release as its own entity.
   git checkout -b $new_release dev
   exit_on_error checking out a new branch called $new_release
+
   # bump feisty meow version. 
   bash ./scripts/generator/next_version.sh
   exit_on_error bumping version for feisty meow codebase
+
   # check in the changes in the new release branch, which now includes a revised version.
 echo about to commit--hit enter
 read line
@@ -61,6 +73,10 @@ echo about to check out master--hit enter
 read line
   git checkout master
   exit_on_error checking out master branch
+
+  rpuffer
+  exit_on_error running rpuffer on master branch to update it
+
   # merge the master branch with the new release.
 echo about to merge--hit enter
 read line