I've noticed that the subversion CLI client option is very limited in it's functionality for cross branch diffs and even the type of merge that can be done. I installed a JavaHL client on my computer (Ubuntu and Windows) and set NetBeans to use it and I have full functionality with cross branch diffs and complex merges. SvnKit doesn't work at all any more due to incompatible licensing with the Apache license.
On Sat, Sep 24, 2022, 00:30 May Doušak <phoe...@apollonus.net> wrote: > Thanks, but it doesn't help. > I have it installed: > > may@R9:~/TMP$ dpkg -l | grep libsvn > ii libsvn-java 1.13.0-3ubuntu0.2 > amd64 Java bindings > for Apache Subversion > ii libsvn1:amd64 1.13.0-3ubuntu0.2 > amd64 Shared > libraries used by Apache Subversion > ii libsvnclientadapter-java 1.10.12-1 > all > High-level Java API for Subversion (library) > ii libsvnkit-java 1.8.14-4 > all pure > Java Subversion client library > > The path is /usr/lib/x86_64-linux-gnu/jni/libsvnjavahl-1.so.0.0.0; > libsvn1 is under /usr/lib/x86_64-linux-gnu/ > > If I switch to "javaHL" in Netbeans settings with or without entering the > path, it automatically switches to "CLI": > > > > When I apply it jumps to CLI: > > > > If I just "OK" it, it asks for svn binary when doing svn operations (i.e. > switches to CLI). > > I tried using the following paths (and restarting after): > > /usr/lib; > /usr/lib/x86_64-linux-gnu/ (libsvn1 path); > /usr/lib/x86_64-linux-gnu/jni/ (libsvn-java path) > and > /usr/lib/x86_64-linux-gnu/jni/libsvnjavahl-1.so.0.0.0 > > But it does the same :-/ > > I'm testing that in NB15. > > Am I missing something? > > > Thank you, > > May > > On 23. 09. 22 22:10, László Kishalmi wrote: > > sudo apt install libsvn-java > > On Fri, Sep 23, 2022 at 12:35 PM May Doušak <phoe...@apollonus.net> wrote: > >> Hi all, >> >> SVN diff used to work for me not so long ago, but for some reason it >> doesn't anymore on none of my machines; all are KDE Neon (=ubuntu 22.04). >> Other SVN operations work. >> >> I have CLI SVN installed and when I want to see diff, I get an error: >> >> *Diffing between revision trees is not supported with commandline client.* >> *Please switch to SVNKit or JavaHL.* >> >> >> I installed svnkit and javaHL: >> >> root@R9:~# dpkg -l | grep svnkit >> ii libsvnkit-java 1.8.14-4 >> all pure >> Java Subversion client library >> ii svnkit 1.8.14-4 >> all pure >> Java Subversion client >> root@R9:~# >> >> jsvn doesn't work at all: >> >> root@R9:~# jsvn >> /usr/bin/jsvn: 29: $cygwin: not found >> Error: JAVA_HOME is not defined correctly. >> We cannot execute $JAVACMD >> >> but Java (and paths) is OK: >> >> root@R9:~# java -version >> openjdk version "17.0.4" 2022-07-19 >> OpenJDK Runtime Environment (build 17.0.4+8-Ubuntu-120.04) >> OpenJDK 64-Bit Server VM (build 17.0.4+8-Ubuntu-120.04, mixed mode, >> sharing) >> >> >> I even tried using HL jar... (/usr/share/java/svnkit-javahl16.jar) with >> no success. >> >> I tried all this on Netbeans 13, 14 and 15. >> >> >> Does anyone have an idea how to make it work? :-/ >> >> thanks, >> >> May >> > >
--------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscr...@netbeans.apache.org For additional commands, e-mail: users-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
