Bob Hanson wrote: > I've fixed the Gamess reader and done a few adjustments to the JUnit > test for the adapter. We should discuss on the changes on the JUnit tests : I think that using System.out in the debug(), ... is a problem because it makes problems less visible. We should find an other way of modifying the tests if you want more info.
> I also tweaked Nico's fix of the FAH reader. > Nico, you probably will want to test that yourself and then build 11.0 > from it. > > What's the simplest way to fix bugs on the trunk and branch? Do you > make diffs and then apply them? No need for diffs. Commit a fix in the trunk and note the release version (for example r9999). Use an other workspace under Eclipse for the 11.0 branch and simply: - right click on the file / directory on which you want to merge, and select Team / Merge... - in the From field : https://jmol.svn.sourceforge.net/svnroot/trunk/.... (you have to replace branches/v11_0 with trunk) - in the first Revision field: 9998 - in the second Revision field: 9999 - click Merge. The merge should be done, you only need to check it is correct and commit it. Nico ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Jmol-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jmol-developers
