On Saturday 15 April 2006 00:23, Bob Hanson wrote: > OK, so now what's the process for uploading? I see the branch 10.2 and > the trunk (10.3?). > > I just committed some fixes for Eric vis-a-vis mmCIF, but I'm wondering > if I put them in the wrong place. (The trunk.)
I think that this patch can be uploaded to the 10.2 branch too. > How do we keep these two -- trunk and branch -- aligned now? It is possible to apply patches from one branch to another, e.g. from 10.2 to 10.3. CVS allowed to do this automatically, but it depended on branches to have not too much diverted. SVN will likely have such an option too. Alternatively, you can apply it manually: 1. make the diff with: svn diff -rsomething-something SomeFile.java > myPatch.txt 2. patch the other branch: cd intoBranch; patch < myPath.txt (in pseudo code :) > Can one Eclipse project update both? Hmm. I doubt it.... No. Maintaining branches does come with serious overhead. So let's not commit new features to 10.2, only bug fixes, and hope those will be few. I guess it would also be a good idea to set a date when we want to release the next stable release: 10.4, in, say, 6 months or so, with a feature freeze after five months. Then new features will be out in the (new) stable soon enough, and we (as developers) know when to stop adding cool but yet untested code clearly in advance. Egon -- [EMAIL PROTECTED] Blog: http://chem-bla-ics.blogspot.com/ GPG: 1024D/D6336BA6 ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Jmol-developers mailing list Jmol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jmol-developers
