On Thursday 31 August 2006 01:48, Bob Hanson wrote: > OK, I'm lost. Here's what I tried: > > commit -m "10.9.50 11.0 beta hydrogen bonding update > > modifying hydrogen bond routine to more appropriately represent hydrogen > bonds. > > " C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Frame.java > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/JmolConstants.java > Sending src/org/jmol/viewer/AminoPolymer.java > Sending src/org/jmol/viewer/Frame.java > Merge conflict during commit > svn: Commit failed (details follow): > svn: Your file or directory 'Frame.java' is probably out-of-date > svn: The version resource does not correspond to the resource within the > transaction. Either the requested version resource is out of date > (needs to be updated), or the requested version resource is newer than > the transaction root (restart the commit).
Indeed an update required. We are supposed to do that before every commit. > (OK, that's because Nico changed Frame.java.) I'm guessing that to be due to this commit: [2006-08-30 22:34:25] <CIA-12> nicove * r5453 /branches/v10_9/Jmol/src/org/jmol/ (19 files in 3 dirs): [2006-08-30 22:34:25] <CIA-12> Reapplying r5072: [2006-08-30 22:34:25] <CIA-12> Introduced Point3fi class which includeds members for screen coordinates. [2006-08-30 22:34:25] <CIA-12> Atom derives from Point3fi. [2006-08-30 22:34:25] <CIA-12> At atom can now be treated like a Point3f, so there are a number of places [2006-08-30 22:34:25] <CIA-12> in the code that can probably be simplified because we don't have to [2006-08-30 22:34:27] <CIA-12> call a method to ask an atom for its Point3f. > (At this point I did an update, which really broke my system, since > there are places where you cannot just take out ".point3f" and have it > work. As far as I could tell.) Taking out the .point3d *is*, I think, the point of commit r5072, reapplied as r5453. > revert -N > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/JmolConstants.java > Reverted > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/JmolConstants.java > update -r HEAD -N > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/JmolConstants.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/JmolConstants.java > Updated to revision 5454. > ===== File Statistics: ===== > Updated: 1 > revert -N C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Frame.java > Reverted > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Frame.java update -r > HEAD C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Atom.java U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Sticks.java U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/LcaoCartoon.java U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/MeasuresRenderer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Polyhedra.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Polymer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Isosurface.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Dots.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Monomer.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/VectorsRenderer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Bond.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/CompoundDocument.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Dipole.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/FrameRenderer.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/NucleicPolymer.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/NucleicMonomer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Frame.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/ModelManager.java > Updated to revision 5454. > ===== File Statistics: ===== > Updated: 18 > RA layer request failed > svn: PROPFIND request failed on '/svnroot/jmol/branches/v10_9/Jmol/src/org' > svn: PROPFIND of '/svnroot/jmol/branches/v10_9/Jmol/src/org': could not > connect to server (https://svn.sourceforge.net) I reported these problems with SourceForge, and they have similar problems. It seems synchronisation problems, back I don't think the know how to solve it yet :( > (so there's a problem of some sort.) See: https://sourceforge.net/tracker/?func=detail&atid=200001&aid=1544383&group_id=1 > commit -m "10.9.50 11.0 beta hydrogen bonding update > > modifying hydrogen bond routine to more appropriately represent hydrogen > bonds. > > " C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > Sending src/org/jmol/viewer/AminoPolymer.java > Transmitting file data ... > RA layer request failed > svn: Commit failed (details follow): > svn: MERGE request failed on > '/svnroot/jmol/branches/v10_9/Jmol/src/org/jmol/viewer' > svn: MERGE of '/svnroot/jmol/branches/v10_9/Jmol/src/org/jmol/viewer': > 500 Internal Server Error (https://svn.sourceforge.net) OK, see bug report. Even though your local checkout fails to note that the commit worked, the commit *did* work in these cases. The IRC transcript of the above commit: [2006-08-31 01:23:45] <CIA-12> hansonr * r5455 /branches/v10_9/Jmol/src/org/jmol/viewer/AminoPolymer.java: [2006-08-31 01:23:45] <CIA-12> 10.9.50 11.0 beta hydrogen bonding update [2006-08-31 01:23:45] <CIA-12> modifying hydrogen bond routine to more appropriately represent hydrogen bonds. (as sort of proof :) > switch > https://svn.sourceforge.net/svnroot/jmol/branches/v10_9/Jmol/src/org/jmol/v >iewer C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer -r5446 > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Atom.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Sticks.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/LcaoCartoon.java U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/MeasuresRenderer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Polyhedra.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Polymer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Isosurface.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Dots.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Monomer.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/VectorsRenderer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Bond.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Dipole.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/NucleicPolymer.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/NucleicMonomer.java > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/Frame.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/ModelManager.java > Updated to revision 5446. > ===== File Statistics: ===== > Updated: 16 > update -r HEAD C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/util > U C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/util/Logger.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/util/LoggerInterface.java > U > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/util/DefaultLogger.java > Updated to revision 5455. > ===== File Statistics: ===== > Updated: 3 > commit -m "10.9.50 11.0 beta hydrogen bonding update > > modifying hydrogen bond routine to more appropriately represent hydrogen > bonds. > > " C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > Sending src/org/jmol/viewer/AminoPolymer.java > Merge conflict during commit > svn: Commit failed (details follow): > svn: Your file or directory 'AminoPolymer.java' is probably out-of-date > svn: The version resource does not correspond to the resource within the > transaction. Either the requested version resource is out of date > (needs to be updated), or the requested version resource is newer than > the transaction root (restart the commit). > > revert -N > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > Reverted > C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > commit -m "10.9.50 11.0 beta hydrogen bonding update > > modifying hydrogen bond routine to more appropriately represent hydrogen > bonds. > > " C:/jmol-dev/workspace/Jmol-v10_9/src/org/jmol/viewer/AminoPolymer.java > Sending src/org/jmol/viewer/AminoPolymer.java > Merge conflict during commit > svn: Commit failed (details follow): > svn: Your file or directory 'AminoPolymer.java' is probably out-of-date > svn: The version resource does not correspond to the resource within the > transaction. Either the requested version resource is out of date > (needs to be updated), or the requested version resource is newer than > the transaction root (restart the commit). > > Basically, I was trying to synchronize when Nico's merge of 5446 came > in. That really broke my system, so I undid it on my local machine. But > I'm still having problems committing AminoPolymer.java. I don't know how > to make my file not "probably out-of-date". Try this: make a backup, locally (not svn!) delete the dir in which the file is located, and svn update that dir again. Egon -- SourceForge developer blog: http://chem-bla-ics.blogspot.com/ ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Jmol-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jmol-developers
