Hi Cameron On 22.06.2005 10:22:57 Cameron McCormack wrote: > Hi Jeremias. > > Jeremias Maerki: > > I'd like to get back to Henri within one day so the ball isn't dropped. > > So I'd appreciate very quick feedback. > > Perhaps this is just my unfamiliarity with svn, but what is the > difference between the 'apache' branch and the trunk? And why is it > that in the apache branch some directories are missing that are in the > trunk? For example here: > > > http://svn.apache.org/repos/test/xmlgraphics/batik/branches/apache/sources/org/apache/batik/ > > the ext, extension, svggen and xml directories aren't listed.
At first, I thought we have a problem here, but I've checked out the "apache" vendor branch from CVS and SVN and compared the two trees. They are identical except for the different content in the $Id$ tags. Also looking into the CVS log using ViewCVS I don't see any hint of trouble. These files are also not listed in CVS. For example on of the package HTML files in the ext directory doesn't contain the markers to make it appear in the "apache" branch: http://cvs.apache.org/viewcvs.cgi/xml-batik/sources/org/apache/batik/ext/awt/package.html?hideattic=0&rev=1.1&view=log On the other side, Bridge.java has such a marker: http://cvs.apache.org/viewcvs.cgi/xml-batik/sources/org/apache/batik/bridge/Bridge.java?hideattic=0&rev=1.8&view=log > Also, > there is a test directory there which isn't in my checked out copy of > cvs HEAD. This seems to contain files which are "dead" according to > viewcvs, for example: > > > http://cvs.apache.org/viewcvs.cgi/xml-batik/sources/org/apache/batik/test/gvt/?hideattic=0 But I don't see these files in the SVN trunk checkout, either, as you found yourself. Subversion works a little differently WRT deleted files. It doesn't have an attic. Instead, when you delete a file, a new revision is created in which this file doesn't show up. More insight below... > I just checked out the svn trunk, and while it didn't give me that test > directory it did however give me a sources/org/apache/batik/refimpl > directory, which in CVS contains only "dead" files. These old files > cause the build to fail. It looks like the directory refimpl has not been properly deleted. At any rate, there is a file under this directory that still has the "MAIN" branch mark which identifies it as alive: http://cvs.apache.org/viewcvs.cgi/xml-batik/sources/org/apache/batik/refimpl/script/ConcreteInterpreterPool.java?hideattic=0&rev=1.7&view=log I have two CVS HEAD checkouts of Batik. One has not refimpl directory but the other has one. ??????? You probably don't get that file with a CVS checkout because CVS stops at the refimpl directory which is probably marked dead. Since cvs2svn runs through everything this file probably resurfaced. It will be easy to delete it after the final import. That's probably less of a problem than tracking down the exact cause and getting it fixed in cvs2svn. Maybe it's even a CVS flaw. I don't know. Below is the SVN log for the refimpl directory. You can see how Interpreter.java was added and later deleted. ConcreteInterpreterPool.java was never deleted. (more below) C:\Dev\Java\workspace\FOP SVNTest>svn log -v http://svn.apache.org/repos/test/xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/ ------------------------------------------------------------------------ r24919 | stefano | 2001-02-19 23:47:40 +0100 (Mo, 19 Feb 2001) | 2 lines Geänderte Pfade: M /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/ConcreteInterpreterPool.java made batik compile ------------------------------------------------------------------------ r24766 | tkormann | 2001-01-23 23:02:40 +0100 (Di, 23 Jan 2001) | 6 lines Geänderte Pfade: D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter.java D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterException.java D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterFactory.java D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterPool.java D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jacl D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jpython D /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino remove refimpl PR: Obtained from: Submitted by: Reviewed by: ------------------------------------------------------------------------ r24764 | tkormann | 2001-01-23 18:17:48 +0100 (Di, 23 Jan 2001) | 6 lines Geänderte Pfade: A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterException.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterFactory.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/InterpreterPool.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jacl A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jacl/JaclInterpreter.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jacl/JaclInterpreterFactory.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jpython A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jpython/JPythonInterpreter.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/jpython/JPythonInterpreterFactory.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino/EventTargetWrapHandler.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino/EventTargetWrapper.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino/RhinoInterpreter.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/rhino/RhinoInterpreterFactory.java missing stuffs added PR: Obtained from: Submitted by: Reviewed by: ------------------------------------------------------------------------ r24763 | tkormann | 2001-01-23 18:14:29 +0100 (Di, 23 Jan 2001) | 6 lines Geänderte Pfade: A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script A /xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/ConcreteInterpreterPool.java <snip/> A /xmlgraphics/batik/trunk/sources/org/apache/batik/svggen/XmlWriter.java A /xmlgraphics/batik/trunk/sources/org/apache/batik/swing A /xmlgraphics/batik/trunk/sources/org/apache/batik/swing/JSVGCanvas.java M /xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/image/ImageTranscoder.java M /xmlgraphics/batik/trunk/sources/org/apache/batik/transcoder/image/PNGTranscoder.java M /xmlgraphics/batik/trunk/sources/org/apache/batik/util/DocumentLoadRunnable.java D /xmlgraphics/batik/trunk/sources/org/apache/batik/util/awt huge and incredible reorganisation :) PR: Obtained from: Submitted by: Reviewed by: ------------------------------------------------------------------------ Depending on the revision you look at, the same URL gives you output or not. It depends on whether a file is present in a certain revision or not. C:\Dev\Java\workspace\FOP SVNTest>svn log -r 24766 http://svn.apache.org/repos/test/xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter. java svn: REPORT Anfrage fehlgeschlagen auf '/repos/test/!svn/bc/24766/xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter.java' svn: '/repos/test/!svn/bc/24766/xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter.java' Pfad nicht gefunden C:\Dev\Java\workspace\FOP SVNTest>svn log -r 24764 http://svn.apache.org/repos/test/xmlgraphics/batik/trunk/sources/org/apache/batik/refimpl/script/Interpreter. java ------------------------------------------------------------------------ r24764 | tkormann | 2001-01-23 18:17:48 +0100 (Di, 23 Jan 2001) | 6 lines missing stuffs added PR: Obtained from: Submitted by: Reviewed by: ------------------------------------------------------------------------ Sorry for the complicated response. I hope this clears up a few things. What's wrong with the refimpl directory is beyond me, but the rest looks pretty good to me. Jeremias Maerki --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
