I'm trying to merge the latest changes from trunk to the
https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign
branch. But I'm getting the following error:
C:\Dev\FOP\main\xml-fop-temp5svnmerge merge
svnmerge: command execution failed (exit code: 1)
svn merge -r
Looks like we should think about using SVN 1.5's merge tracking instead
of svnmerge:
http://blogs.open.collab.net/svn/2007/10/subversion-15-m.html
svnmerge.py doesnt always properly merge merge-properties (like
svnmerge-integrated and svnmerge-blocked), leading to property conflicts
when merging
I've looked at svnmerge-migrate-history.py and performed the changes
manually on the branch. At least, I can continue now and deal with the
conflicts that appeared anyway. Let's hope my changes don't produce any
problems downstream.
On 17.07.2008 15:15:28 Jeremias Maerki wrote:
Looks like we
