The merge

I am looking to migrate from CVS to Subversion for a project, but I need
to make sure the eclipse plugin is stable.

After installing the Subeclipse from http://subclipse.tigris.org/update
and throwing in the URL:
svn+ssh://192.168.0.1/home/staff/hendry/repo/trunk/

I get a javahl client exception. Ok, well maybe I need tmate's JavaSVN
library from http://tmate.org/svn/

That installed, I seem to be able to browse my repo in eclipse.

Ok, now I am going to fiddle around and create a branch and merge back
into the trunk.

Oh no, another "not implemented yet" javahl client exception.

commit -m "Changed last line" C:/Documents and Settings/hendry/Desktop/eclipse/workspace/SABSDoc2/Database/readme.TXT
    Sending C:/Documents and Settings/hendry/Desktop/eclipse/workspace/SABSDoc2/Database/readme.TXT
    Committed revision 4262.
merge -rHEAD:HEAD svn+ssh://192.168.0.1/home/staff/hendry/repo/trunk/SABS/SABSDoc/Database/readme.TXT C:/Documents and Settings/hendry/Desktop/eclipse/workspace/SABSDoc2/Database/readme.TXT
    not implemented yet

In preferences the SVN Interface is Javahl(JNI). The command line
interface is not available and the "beta" bit doesn't sound worth
trying.

How do I get the (merge) features on the page:
http://subclipse.tigris.org/

Working then? Have I missed something in the preferences?

Should I be using TortoiseMerge?

Is it worthwhile to migrate away from CVS?

Best wishes,
Received on Tue May 17 11:00:30 2005