Re: [Patch 101 lesson] RTF patch problem fixed
Does it make sense for xml-fop dev'ers to standardize on a particular directory structure for CVS? It seems that this problem might have been averted had Glen used what I was the standard directory structure for xml-fop development: for development purposes it is best if xml-fop builds be built from under the xml-fop/ directory. If so, some sort of standard directory structure might be a good addition to the Fop-Dev FAQ. DISCLAIMER: If this doesn't make sense (me being something of a CVS-newbie), please disregard. I'm not trying to be picky here, just hoping to learn whether this thought process might improve efficiency for [PATCH] submissions. ;-) Christian Geisert said: Glen Mazza wrote: [..] 2.) My problem with yesterday's file is that the Index was Index: xml-fop/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java, but I don't store FOP in an parent directory named xml-fop. I manually edited all the indices in the patch file to just start with src/java/... and re-ran from my base directory (for me, xml-fop-10), to get it to work. The p option of the patch command should take care of this ;-) (at least the linux version) In this case: patch -p1 coolpatch.diff Christian -- Clay Leeds - [EMAIL PROTECTED] Web Developer - Medata, Inc. - http://www.medata.com PGP Public Key: https://mail.medata.com/pgp/cleeds.asc
[Patch 101 lesson] RTF patch problem fixed
Thanks for the help, Jeremias, on the patch problem I had yesterday. I confirmed the problem was the Index: sections all holding the name of a parent directory of FOP, whose name I wasn't using for my own local version of the software. For the benefit of the FOP-DEV archives, should this occur for anyone else (and, also, should I forget about this a month from now... ;): 1.) The patch command needs to be run from the directory where the Index: statement in the patch file makes sense, e.g., for an index of Index: fo/FOInputHandler.java the patch file should be run from the src\java\org\apache\fop directory, using: patch fo\FOInputHandler.java patchFile.txt (Windows) 2.) My problem with yesterday's file is that the Index was Index: xml-fop/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java, but I don't store FOP in an parent directory named xml-fop. I manually edited all the indices in the patch file to just start with src/java/... and re-ran from my base directory (for me, xml-fop-10), to get it to work. Thanks, Glen __ Do you Yahoo!? Free Pop-Up Blocker - Get it now http://companion.yahoo.com/
Re: [Patch 101 lesson] RTF patch problem fixed
Glen Mazza wrote: [..] 2.) My problem with yesterday's file is that the Index was Index: xml-fop/src/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java, but I don't store FOP in an parent directory named xml-fop. I manually edited all the indices in the patch file to just start with src/java/... and re-ran from my base directory (for me, xml-fop-10), to get it to work. The p option of the patch command should take care of this ;-) (at least the linux version) In this case: patch -p1 coolpatch.diff Christian
