You are viewing a plain text version of this content. The canonical link for it is here.

Posted to fop-dev@xmlgraphics.apache.org by Vincent Hennebert <vh...@gmail.com> on 2009/08/26 20:57:24 UTC

Re: svn commit: r808135 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr: ./ inline/

> Author: vhennebert
> Date: Wed Aug 26 17:42:11 2009
> New Revision: 808135
> 
> URL: http://svn.apache.org/viewvc?rev=808135&view=rev
> Log:
> Reverted changes made in revision 796809 (manual merge of clean-up changes made in the ChangingIPDHack branch). Those changes will be re-applied when merging the branch back to Trunk with svn merge --reintegrate (if everything goes well...)

And of course not everything went well. svn merge --reintegrate failed
for obscure reasons of subtree mergeinfo, explained in more details on
the following page:
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html

I ended up doing the merge ‘by hand’ using the 2-URL merge syntax
mentioned in the document above. Hopefully everything went well. I think
the svn:mergeinfo properties should be cleared from most of the files in
the repository. Attention also needs to be paid when moving/copying
files. According to the document above the svn:mergeinfo property
created in such a case is most of times unnecessary.


Vincent