This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.2.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 6fd7830adaa603c8dce63d28b1f5aad49d251383 Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Sep 28 12:15:31 2023 +0100 Need to switch back to 1.2.x to update source tree --- jnirelease.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/jnirelease.sh b/jnirelease.sh index cc1226088..616788c35 100755 --- a/jnirelease.sh +++ b/jnirelease.sh @@ -175,6 +175,7 @@ if [ $diffcount -ne 0 ]; then echo "WARNING: git subtree is not up to date with" echo " $TCJAVA_GITBASE" echo " Either correct now by running" + echo " 'git checkout 1.2.x'" echo " 'git rm -rf java/org/apache/tomcat/jni'" echo " 'git read-tree --prefix=java/org/apache/tomcat/jni/ -u tcjava/9.0.x:java/org/apache/tomcat/jni'" echo " 'git commit'" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org