diff --git a/admin-tools/merge-for-2.4.sh b/admin-tools/merge-for-2.4.sh new file mode 100755 index 00000000..f8c55395 --- /dev/null +++ b/admin-tools/merge-for-2.4.sh @@ -0,0 +1,5 @@ +#/bin/bash +cd $(dirname ${BASH_SOURCE[0]}) +if . ./setup-python-2.4.sh; then + git merge python-3.0-to-3.2 +fi diff --git a/admin-tools/merge-for-3.0.sh b/admin-tools/merge-for-3.0.sh new file mode 100755 index 00000000..7fc1a596 --- /dev/null +++ b/admin-tools/merge-for-3.0.sh @@ -0,0 +1,5 @@ +#/bin/bash +cd $(dirname ${BASH_SOURCE[0]}) +if . ./setup-python-3.0.sh; then + git merge python-3.3-to-3.5 +fi diff --git a/admin-tools/merge-for-3.3.sh b/admin-tools/merge-for-3.3.sh new file mode 100755 index 00000000..aade2e77 --- /dev/null +++ b/admin-tools/merge-for-3.3.sh @@ -0,0 +1,5 @@ +#/bin/bash +cd $(dirname ${BASH_SOURCE[0]}) +if . ./setup-python-3.3.sh; then + git merge master +fi