Administriva:

code to merge branches

Author: rocky

admin-tools/merge-for-3.0.sh

@@ -0,0 +1,7 @@
+#/bin/bash
+owd=$(pwd)
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-3.0.sh; then
+    git merge python-3.3-to-3.5
+fi
+cd $owd

admin-tools/merge-for-3.2.sh

@@ -1,5 +1,7 @@
 #/bin/bash
+owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.2.sh; then
     git merge python-3.6-to-3.10
 fi
+cd $owd

admin-tools/merge-for-3.3.sh

@@ -0,0 +1,7 @@
+#/bin/bash
+owd=$(pwd)
+cd $(dirname ${BASH_SOURCE[0]})
+if . ./setup-python-3.3.sh; then
+    git merge python-3.6-to-3.10
+fi
+cd $owd

admin-tools/merge-for-3.6.sh

@@ -1,5 +1,7 @@
 #/bin/bash
+owd=$(pwd)
 cd $(dirname ${BASH_SOURCE[0]})
 if . ./setup-python-3.6.sh; then
     git merge master
 fi
+cd $owd

admin-tools/setup-master.sh

@@ -11,11 +11,6 @@ function checkout_version {
     return $?
 }
 
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 owd=$(pwd)
 bs=${BASH_SOURCE[0]}

admin-tools/setup-python-3.2.sh

@@ -11,11 +11,6 @@ function checkout_version {
     return $?
 }
 
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 owd=$(pwd)
 bs=${BASH_SOURCE[0]}
@@ -37,3 +32,4 @@ cd $owd
 rm -v */.python-version || true
 
 git checkout python-3.2-to-3.5 && pyenv local $PYTHON_VERSION && git pull
+cd $owd

admin-tools/setup-python-3.6.sh

@@ -11,11 +11,6 @@ function checkout_version {
     return $?
 }
 
-# FIXME put some of the below in a common routine
-function finish {
-  cd $owd
-}
-
 export PATH=$HOME/.pyenv/bin/pyenv:$PATH
 owd=$(pwd)
 bs=${BASH_SOURCE[0]}
@@ -37,3 +32,4 @@ cd $owd
 rm -v */.python-version || true
 
 git checkout python-3.6-to-3.10 && pyenv local $PYTHON_VERSION && git pull
+cd $owd