This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new be39e10ad Need to switch back to main to update java source tree
be39e10ad is described below
commit be39e10adb89fbb8956024c1b7015d39a4043254
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 27 12:13:39 2023 +0100
Need to switch back to main to update java source tree
---
jnirelease.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/jnirelease.sh b/jnirelease.sh
index 4882d5b0d..3d53336ac 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 co main'"
echo " 'git rm -rf java/org/apache/tomcat/jni'"
echo " 'git read-tree --prefix=java/org/apache/tomcat/jni/ -u
tcjava/main: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
