David Crossley wrote:

Ferdinand Soethe wrote:
Thinking again: I'd also need to merge the pdf-plugin dir back into trunk so that change history of files is preserved.

Can I do such a partial merge?

Yes, see the svn book for instructions. Merge can operate at
any level of the tree.

However, why not just merge the whole lot.

I'd like to do that but I have this tricky issue with

Author: ferdinand
Date: Mon Dec 10 23:53:07 2007
New Revision: 603165

URL: http://svn.apache.org/viewvc?rev=603165&view=rev
Log:
Replacing fop-0.20.5.jar with fop-0.94.jar, adding supporting modules and 
reconfiguring plugin to use it.

Added:
    
forrest/branches/UpdateFOPto094/lib/core/cocoon-fop-ng-impl-1.0.0-SNAPSHOT.jar  
 (with props)
    forrest/branches/UpdateFOPto094/lib/core/commons-io-1.3.1.jar   (with props)
    forrest/branches/UpdateFOPto094/lib/core/commons-io.LICENSE.txt
    forrest/branches/UpdateFOPto094/lib/core/commons-io.NOTICE.txt
    forrest/branches/UpdateFOPto094/lib/core/fop-0.94.LICENSE.txt
    forrest/branches/UpdateFOPto094/lib/core/fop-0.94.jar   (with props)
    forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons-1.2.jar   
(with props)
    forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons.LICENSE.txt
    forrest/branches/UpdateFOPto094/lib/core/xmlgraphics-commons.NOTICE.txt
Removed:
    forrest/branches/UpdateFOPto094/lib/core/fop-0.20.5.jar
    forrest/branches/UpdateFOPto094/lib/core/fop-0.20.5.jar.license.txt
Modified:
    
forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/output.xmap

where I removed fop-0.20.5.jar and added fop-0.94.jar in the same transaction and I didn't know how best to undo the deletion of fop-0.20.5.jar w/o undoing the rest.

Best regards,
Ferdinand Soethe