Have you deletde your preference settings file (at least rename them is what I do) so the trunk can create a new preference settings file in your vassal directory? When Im not using trunk I rename the newly created preferences file afterward to preferences32 so I can just swap as needed
Peer-to-Peer and Custom Jabber Server connection types should be working ok. I still need to do a little work to get the client to link to the dynamic Vassal Jabber and legacy servers. Will try and fix asap, but this should at least enable people to start using the trunk.
I have significantly reworked the whole GUI for selecting and using different servers, trying to make it simpler and more ‘obvious’. Any and all comments appreciated.
I just checked in code to replace ZipArchive (which never appeared in
any release) with the new NIO filesystem stuff. This seems to work, but
I have not yet tested it thoroughly. (Anyway, this knocks off one very
old bug…)
I’ve been trying to update the trunk (my copy) with all your changes for NIO, etc. and the updates keep failing (I’m using the Update to HEAD command in eclipse). Am I doing something wrong?
I have had problems in the past also. Over time, I have worked out a method that works for me.
I always specify the exact revision numbers I want to merge. If I merge up to trunk revion 1234, I include that in the commit comment.
Then, when I merge up to revision 1345, I use the ‘Select Revisions’ button and select revisions 1234 and 1345 from the list. This gets entered as 1345-1234.
You can always delete your copy of the trunk and check it out fresh. I do this regularly also.